Merge pull request #273 from svost/includes