Improved cheat resistance.
fixed manual submission
Merge branch 'master' into coursera