Enable/disable based on supervisor mode #48
Fixed #409