Some code-Cleanup and small fixes
Merge pull request #78 from broggi/master

Some code-Cleanup and small fixes