get up shu's master branch
refact
fix #1 d$ problem