Fixing issue with live/on switch
Merge branch 'develop'