Upgraded dependencies
Merge pull request #571 from hansjoachim/dependencies

Upgraded dependencies
Revert 563e87f, added extra acceptance test. Fixes #570.