Prototype version 1
Merge pull request #1 from esamson74/master

Prototype version 1