Fixed template substituion when value is None (not found on environment)
Merge remote-tracking branch 'origin/pr/74' into v4

Closes #74.