Upgraded dependencies, fixed source format.