Merge pull request #8 from vebers/develop

Fixes to includes