Issue #216

active/inactive is implemented
Merge pull request #226 from FWAJL/dev

Issue #216