fixed browser compatibility issue with global name 'History'
Merge branch 'master' into gh-pages