Fixes
Fixes
Merge pull request #2 from johankool/master

Fixes