thies-patch-1 #44

Closed
thies wants to merge 3 commits from thies-patch-1 into master

3 commits