Merge pull request #3 from DavidS/master

Update templates to 3.x syntax