fixes issue #10
Merge branch 'dev-0.1.3' into release-0.1.3