A few template updates
Merge branch 'master' of https://github.com/kynetx/Fuse-API