Merge pull request #1996 from rperryman/master

Updated with namenode definition