Updated to work against latest version of WellBehavedPython