Fixes #12
Version 0.4.3
Merge branch 'master' into dev/0.5.0