Fixes minor issues
Merge pull request #2 from Ralt/master

Fixes minor issues