Add sorting to features (see #8)