fix#20
Merge branch 'master' into dev
Merge branch 'dev'