fixing bugs for the new templates done
Merge pull request #21 from vadhawal/master

fixing bugs for the new templates done