Always add the proper file extension (closes #2)