fixed #211
Merge branch 'develop'