Issue35

Add small improvements of issue #35 for the v0.5.0 release. Just to keep the dev branch up-to-date.