update by haidong
update by haidong
Merge branch 'master' of github.com:haidong2014/easysims
update by haidong