initial commit
Merge pull request #89 from ctetreault/master

initial commit (from resynch'd fork)