CS fixes
Added support for guzzle 5