Simplify display of invalid answer
Merge branch 'master' into gh-pages