initial commit
Merge pull request #101 from ctetreault/master

initial commit