Merge pull request #606 from emmanuel-keller/1.5

Bug fixes and libraries updates