Fix issue #43
Merge branch 'fix-43'