Issue #2378. Minor additions. Implemented suggestions by WouterJ.
Merge pull request #2436 from kevintweber/2.0

Issue #2378. Minor additions. Implemented suggestions by WouterJ.