Fix #605
Libraries update

Conflicts:
	pom.xml
Libraries upgrade
Merge pull request #608 from emmanuel-keller/master

Bug fix and libraries upgrade