callbacks working
resolve conflict
fix small bug
Merge pull request #14 from danielkeller/nm_callback_conversion

Nm callback conversion