Update libraries

Update libraries (issue #13).
Seems to work, but need to be tested a bit more.