obsolete changes from c9.
Merge branch 'master' of github.com:brentonjay/nrds