Merge pull request #1 from appium/master

update