Implements feature #7