Fixing some things
Merge pull request #1 from Karhide/master

Fixing some things