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

Fixed minor bugs