Merge pull request #81 from jszumigaj/master

fixes #83