Merge pull request #12 from rsiv/master

Fixed missing scale and removed redundant join in query
Fixed a minor issue with data points comparison returning true for both 0 and null