More fixes for directory_functions
Merge branch 'master' of https://github.com/keenanjohnson/cpe4160