Closes #1228
Merge pull request #1258 from 19Gerhard85/patch-1

Closes #1228