Some bugs
Merge branch 'master' of https://github.com/Kukambara/worldofzaar