popup init fix
popup fix
Merge branch 'master' into chrome_popup