Includes remarks from Stefan Rieger  #171