Add insert through conversion function to histogram.
Merge remote-tracking branch 'origin/master'

Conflicts:
	histogram.h