Just a typo
Changed localstorage
Merge branch 'master' into gh-pages