fixed #15
Merge branch 'develop'