added code from github.io/weave
Merge branch 'mybranch'

:wq