Merge branch 'master' into gh-pages
made validation more robust
removed form elements
Merge branch 'gh-pages'