Handle null property values
Merge pull request #18 from reywood/master

Handle null property values