Updates from mbkumar/pydii