initial commit
Merge pull request #1 from panique/develop

initial commit