Fix issue #63
Merge branch 'hotfix-63'