1. fixes bugs.
1. remove unused descriptor.cc
Merge pull request #3 from chengstory/v3_fixesBugs

1. fixes bugs.