initial commit
Merge pull request #1 from jsher/develop

initial commit