Merge pull request #49 from ChrisBoesch/master

update
date picker #1
Merge pull request #332 from ruijunhuang2010/master

update