Merge pull request #1 from SnapSearch/develop

Accepting revisions from peer review.
Merge remote-tracking branch 'liuyu/develop' into develop