merge new stanford arduplane code