Merge pull request #442 from mhaskel/add_base_name