Question Template added/fixed.
Merge origin/master
Minor change.