Fixed simple bugs
Merge pull request #40 from Gizmmo/master

Fixed simple bugs