Changes for NAN 1.0.0