Fixing all issues listed in #31.

Thi spull request basically fixes all issues discovered during the release process for 1.4.12

Fix #31