Merge pull request #518 from rustyswayne/1.0.1

Patched Activate and Deactivate issue discovered in UI.