Change friend functions to members
v1.3.0, update Changes