use andyet.net
Merge branch 'master' into multiple-bridges
refactor
refactor channel update