Updated dependencies
Merge branch '1.0'