merge nrtm-comparison into master