Merge pull request #10 from koeart/master

dinge halt
code clean up
Merge pull request #22 from blotter/master

code clean up