Fix bugs
Merge branch 'master' of https://github.com/mparodi/Wall-e