fix for null values
Merge pull request #16 from dusty/master

fix for null values issue #15