Merge branch 'develop'
Fix #34
Merge branch 'fix#34'