fix a bug for parseQuery func
Merge branch 'master' into pr/20

Conflicts:
	Uri.js