bug fix #61
Merge origin/develop into develop
Merge origin/develop into develop