Fixes #7

Upgraded dependencies and minor code formatting.