renamed basename, partially fixes #24