bug fix for issue #6
Merge branch 'hotfix/fix_for_issue_6'