Merge pull request #45 from dreipunktnull/master

[BUGFIX] Fix undefined variable
Merge pull request #46 from dreipunktnull/master

[TASK] Some code cleanup