TEMP fix, modes need to be redone
Merge branch 'master' into onkyo