Merge pull request #1 from UK992/master

Update version
Add ability to disable Color Picker
Update version
Update version
Roll back version
Merge pull request #2 from UK992/test-2

Add ability to disable Color Picker