Merge pull request #29 from Panic-Tycoons/develop

Iteration 8.5?