Adding directory check back in
Merge branch 'develop'