Merge branch 'gh-pages'
added quick fix for canceling prompt