Merge pull request #61 from januarsiregar/master

fixing refernce
fixed templating mechanism
fixed reference