con and dis control
Merge pull request #1 from yl-1993/master

con and dis control