Merge pull request #39 from yanyankangkang/master

for zhou chen
fix bugs in retrieval measures
Merge pull request #7 from 11693-01/master

get from zhou chen