fixing refernce
Merge pull request #61 from januarsiregar/master

fixing refernce
fixed templating mechanism
fixed reference
Merge pull request #62 from januarsiregar/master

fixed reference