merge
 .
Merge branch 'master' of https://github.com/lenxyang/sandbox
 fixbug for annotate_data