Merge NED



last revision 1/31/2017