Adding some bugs.
Merge branch 'master' of https://github.com/NinjaTrappeur/IsiProject