fix #4
Merge branch 'fix_issue_4' into develop