Slight edit to bottom template.
Fixed typo
Merge branch 'master' into pointToEnd