Fix #31
Merge branch 'fix#31' into develop
Merge branch 'develop'