initial push
Merge pull request #5 from jholowczak/master

version 1 code