updated to 1.7 minor fixes and 2014
fix conflicts with earlier commits