Bug fix
Merge branch 'master' of github.com:Tsume/Otoru-Project