initial commit
Merge pull request #183 from ctetreault/master

initial commit