Refactored some code to make the library work w/ the new Guzzle API and updated tests.