initial commit
Merge pull request #20 from nphillips/master

initial commit