Some more fixes
Merge pull request #11 from Vallhalen/patch-2

Some more fixes