Add issue 59 from Daniel K.