updated
Merge branch 'dev' into lei_dev
bugs fixed