Removed obsolete AddBaseDir as code relying on it would behave wrong. Solves #249

Solves #249