Andrew's fixes
Merge branch 'master' of https://github.com/WeeverApps/weever-plugin-common