initial commit
Merge pull request #2 from panique/develop

initial commit