Merge pull request #58 from billmn/1.5/develop

Fixed issue #57 for the latest release of Twig (1.12.0)