NODA base code 4/22/14. lmk
Merge origin/master