modifications to pass unit test
Merge branch 'master' of https://github.com/cphoover/Includer