first commit
Merge branch 'master' of https://github.com/hsienwei/pomelo_test

combine from github