merged master into fenichel