fixes #50
fixes #51
Merge pull request #52 from MauriceMohlek/master

merge
Auto style fixer
Merge branch 'clang-format-fixer' into clang-format