Prototype version 0.7
Merge pull request #26 from rod-hynes/master

Prototype version 0.7