Names corrected, comment regex corrected by Paul.