Merge pull request #2 from tomneo2004/phone

phone got change
pad changed
about to merge
Merge remote-tracking branch 'upstream/master' into phone
asssssdfsa