Committing changes ISSUE-9, fixing #9