Added back button protection
Merge branch 'master-dev' into gh-pages