Revisited #305 and added natural sorting