Add issue 34