Feature/templates ranjan

@sanatan, please update this code and merge to develop.