Merge pull request #607 from emmanuel-keller/1.6

Bug fixes and libraries upgrades