Add issue 60 from Daniel K.