fix#22
Merge branch 'master' into dev
fix#23
Merge branch 'dev'