Fix template deprecations
Merge pull request #10 from bkkrw/master

Fix template deprecations