Fixed bugs
Merge branch 'master' of https://github.com/hacktm/Web-Hakuna-Matata