Merged changes with Fee
Merge branch 'master' of https://github.com/fee01/dino.git