Fix bugs
Merge pull request #171 from dreamteam69/master

Fix bugs