Merge pull request #28 from Harshavardhana/master

client: refine annotations