Fix bugs
Merge pull request #52 from windyarts/master

Fix