Fixed template loading bug
Merge pull request #1 from messica/master

Fixed template loading bug