improve load speed 1.0
Merge branch 'dev'