Fixed minor bugs
Merge pull request #32 from eggrevolver/master

Fixed minor bugs