Remove dependency on FILE_DIR
Fix for #111
Merge pull request #139 from SirLazarus/master

Removal of FILE_DIR dependency and resolution of issue #111