Fixed a Query Path Bug
Fixed a conflict
Merge branch 'master' of git://github.com/communitychair1/HVClientLibPHP