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