Fix on nested templates with unit test
Merge pull request #26 from wikiLingo/1.x

Fix on nested templates with unit test