Fixing all issues listed in #31.

Fix #31
Merge pull request #32 from benouat/release_1.4.12_bug_fix

Fixing all issues listed in #31.