Merge branch 'gh-pages'
Added prompts and small bug fixes.

Added some verification prompts and fixed a few bugs.
Merge branch 'master' into gh-pages