Merge pull request #1 from jishnu7/master

PEP8 Cleaning

Some more cleaning effort by jishnu. Merging this request hoping Jishnu has tested this code well ;-)
added templates