Properly handle names with dots in them (fixes #5)