Merge pull request #48 from pettai/master