merging master into Flack