Support of null
Merge pull request #540 from remoe/patch-12

Support of null