initial commit
Merge pull request #1 from ottemo/develop

initial commit