优化
Merge branch 'weechat'