Add support for null
1.0.1