updated to latest and greatest NH master - tests all pass