Merge pull request #81 from otih/master