Merge pull request #26 from mmicko/master

entry point and forceincudes fix