Removed assumption that company data files exist. Fixes #27 Fixes #41