Updating with templates
Merge pull request #202 from piyushparkash/dirty

Updating with templates