#183 fix bug
Merge branch 'issue_183' into develop