Removed final modifier from method so we can override elsewhere
Added new test method and refactored to split old methods
Fix to use correct number of bins
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
added new convenience method
Fixed handling of sign-extension of shorts