Fix #19; integrate changes from Threase