Merge pull request #1 from mycolorway/master

improve some details
Merge pull request #2 from mycolorway/master

又修复了一些bug
add disable/enable method