Fix #17

Also update some dependencies.