Fix issue #9
Merge branch 'hotfix/ticket-9'