Fixing merge conflicts of another pull request

Fixed merged conflicts of https://github.com/appium/appium/pull/78