Added Michael's PD patch
Merge branch 'master' into nb_fixes