Merged with last push
Merge branch 'master' of https://github.com/froozen/Pet.git