Fix comment not in sync
Merge Request into Client
Move public methods to the top
Version bump: 0.2.8