Fixes linter errors
Merge pull request #685 from tschneidereit/master

Fixes linter errors