Implements #80