Implemented a feature requested by @Tordek.