Fixes #45,  zero values treated as null values