Credits finished
Merge branch 'master' of https://github.com/aimarrod/Madman-in-a-box
Some reworks