Fixes nh and adds some tests for it.
Merge remote-tracking branch 'origin/master'