Template blocks fixed
Merge pull request #303 from shinesoftware/sandbox

Template blocks fixed