Merge pull request #40 from harshavardhana/master

client: Enhanced Link Attribution code added