Update Templating, Events, Parser
Merge pull request #2 from vinhtrinh/master

Update Templating, Events, Parser