Closes issue #3
Merge branch 'fix_issue_3'