Add issue 38 and 39