Updated sources.
Updated CMake and lib.
Updated test.