Refactoring code and fixing several bugs
Merge branch 'master' of github.com:pin3da/zen-music-quest