bnvk merge branch 'webext' by @Treora towards #16