Really fixes #115
Merge branch 'develop' (v0.12.1)