Refresh

Refresh in preparation for python3 port