Change types to prepare for 2d histograms
Merge pull request #12 from rolandjudd/master

Change types to prepare for 2d histograms