Prototype 4
Merge pull request #26 from imthexie/develop

Prototype 4