Fixed issues with includes
Merge pull request #3 from willluongo/more_ideas

Fixed issues with includes