Fixed #1, removal of suffixes is now done by finding the index of the last dot