Added tests and events to activate/deactivate, fixes #2 & #4
Merge branch 'develop'