Improved code style and fixed linting errors
Merge pull request #89 from rolandschuetz/master

Improved code style and fixed linting errors