Merge with cjhanks/PyUDT master
Fix submodule