Fix github issue #64
Merge branch 'fix-gh-issue-64'