initial commit
Merge pull request #1 from phillyc/develop

initial commit