Doc fix #268
Addressing defernums issue again (#213)
Fixing bug #270
Merge branch 'dev' into ms