Implements #1298
Work on #1298
Update dependencies

Conflicts:
	pom.xml
Fixes #1300
Implements #1241
Merge pull request #1304 from emmanuel-keller/master

Bug fixes and improvements