Merge pull request #11 from xiaoqin2012/master

merge from Xiaoqin
add lookup button
Merge pull request #31 from piaw/master

add lookup button