Updating dependencies. Manual merge of #34.