Improved the twig loader
Merge pull request #59 from hason/loader

Improved the twig loader