Fixing issue #7
Merge branch 'features/issue-7'