Merge pull request #838 from yogeswaran/histogram