Made the Template Tags DRY
Updated Demo and Documentation
Merge pull request #5 from suhailvs/dev

Dev