Merge pull request #3 from jjf28/master

Matching directory fix to master
Merge pull request #5 from jjf28/development

Merge pull request #3 from jjf28/master