update by Yufei Wang
merge sorashiro pr
Merge branch 'sorashiro-master'