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

simplified everything even more