Merge pull request #19 from falbrech-hsdg/quickfixes

Quickfixes
Merge remote-tracking branch 'upstream/master' into quickfixes