add info
Merge branch 'master' into bwlogd-json