Fixed issue #11
Merge branch 'f_issue_11' into develop