API Improvements
Merge branch 'master' of github.com:pfletch1023/nodr