last commit
Merge pull request #92 from lukaswelte/final-final-fixes

last commit