Merge branch 'gh-pages'
bug fix: user entering empty string
Merge branch 'master' into gh-pages