added kill switch
Merge branch 'hotfix/kill_switch'