Merge pull request #75 from kobik/master