merging in master updates
updating util