TDIS-82 - added subfolder support
Merge pull request #22 from TDispatch/subfolder-support

Subfolder support