Merge pull request #9 from eliasdiem/master

Mainly cleanup
Merge https://github.com/Opentronix/Opentronix