Updated build script
Added template inclusion directive
Merge branch 'master' of ../ttt