Implements #107