Handle nested source directories
Merge pull request #201 from guymers/nested-src

Handle nested source directories