Fixed handling of null values
Merge pull request #2 from yvondamours/master

Fixed handling of null values