A bugfix and a new feature.