Submitted by: Andreas Kohout <shanee@augusta.de>
Closes PR 1529. Submitted by: Andreas Kohout <shanee@rabbit.augusta.de>