fix to correct channel
proper name syntax
Merge branch '1.0'
Merge branch 'master' into develop