Fixes #348
1 new commit added
Applies SME feedback
Merged manually.
Pull-Request has been closed by pbokoc
Fixes #348