Removal of FILE_DIR dependency and resolution of issue #111