Fixed issue #18
Merge branch 'bugfix-issue-18' into develop