Implements #119