Add secret switches, closes #184
Merge branch 'feature/secretSwitch' into develop