simplified everything even more
Merge pull request #3 from panique/develop

simplified everything even more