needed for mac os
fixed stuff
Merge pull request #38 from qvarnis/master

Fixes