...clean and rewrite

...
...bump
Merge pull request #1 from derdoktor667/develop

Develop