fix#5
Merge branch 'dev'