tempate update
Merge pull request #633 from Tendrid/develop

tempate update