update to r2226
Merge branch 'master' of https://github.com/Grabber66/nhd2