v1.6.0.1 - better support for handling null values.