Conditional compilation for various features
Merge branch 'master' of https://github.com/apdlv72/SwitchControl