Updated to add support for python3