Merge pull request #73 from birjolaxew/master

Fixes