fixed #40
Merge branch 'develop'