Merge pull request #38 from qvarnis/master

Fixes