secound half merge
Group by source ok ! And fix some format
Merge branch 'graphMike'
merge from master