Adding enable/disable feature
Add enable/disable feature
2.1.0