Merge pull request #37 from mikekap/develop

Add support for includes & service extends
Fix set constants.