correct bug when client use on different server
correct bug when client use on different server
correct bug when client use on different server
Merge origin/master

Conflicts:
	lib/expo.js
	package.json