Merge pull request #90 from ToeBee/master