#54 + changes to object Point