Merge pull request #393 from iamqizhao/master

Part1: revise Picker API