initial commit from work
Merge pull request #7 from sheldrand/work

initial commit from work