Apply pixelpoint changes to their v1.7
Make proposed v1.8