Add issue 118