Prototype 0.1

Merging the Prototype v 0.1 to master