histogram generation
Merge branch 'develop'