Add issue 36