Handle subdirectories
Merge pull request #12 from TWal/master

Handle subdirectories