Implements #105
See CHANGES for details