Adding initial version
Merge pull request #1 from cwnidog/john-branch

Adding initial version