Added folder includes support
Merge pull request #3 from fergusean/master

Subfolders!