Fixing Bugs
Merge branch 'master' of https://github.com/ahsanali/manekineko