Add support for scoped properties files.
Merge remote-tracking branch 'origin/master'
Add a simple Histogram