Merge branch 'develop'
1.0.0
Merge branch 'develop'
Update dependencies
1.1.0
work on enable/disable