v2.0: Updated libraries. Fixed shims. Added unit test suite.