more returning error instead of bool
Merge branch 'master' into onkyo