Module disabling
Fixed #470
Merge