joachimmarder Merged changes of pull #1176