Better dependencies, resolves #108