issue #4

-first steps
Merge pull request #4 from jay-doubleyou/master

update from original