Fixed issue #19.
Merge branch 'bugfix-issue-19' into develop