Fixing small issue
Merge branch 'chrome-extension' into release-v0.5