Fixed issue #44
Merge branch 'issue-44' into develop