Upgrade libraries
Merge pull request #352 from emmanuel-keller/master

Upgrade libraries