Update dependencies

* Includes pull requests #898 and #903.
* Works with both static library and CocoaPods usages.