#228 - TemplateVariable now correctly rejects invalid parameters.
#224 - Fixed type in readme.

Removed trailing whitespace as well.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into develop