merged chris f branch into master