Make changes to be python3 compatible again

closes #26