initial commit
Merge pull request #3 from panique/develop

initial commit