replace magic number with named constant
Merge branch 'master' of https://github.com/maxdeliso/twig
fix minor type incompatibility, remove unused headers