modified to extend base template
Merge pull request #35 from mk200789/master

modified to extend base template