fixing #3
Merge branch 'fix_issue_3' into develop