Fixes issue#43
Merge branch 'master' into issue-43