Simple minor improvements from pull request #144 to be included in version 0.1

This pull request cherry-picked the simple minor improvement that can still be incorporated in version 0.1.
All changes are of very simple nature, are easily checked by review and raise no larger questions.