Updated the counts
We now try to place next to the same color if possible
Merge branch 'master' into gh-pages