Fix issue 64
Merge branch 'issue-64' into develop