Merged master into fitting