Fixed issue #16
Merge branch 'hotfix/Issue16'