Fix #10
fix #10
Merge branch 'dev'