Merge pull request #45 from MaskRay/include