Some fixes to FAQ and Control-Flow
Merge remote-tracking branch 'origin/master'