Adding fixes from master to nei branch by creating a new commit
Merge pull request #151 from JoeMurray/fix-templates

Adding fixes from master to nei branch by creating a new commit