fixing bugs
Merge branch 'master' into hongkun