Fixed error in Chrome
Merge branch 'master' into production