Committed new versions of the libraries after issue #15