Merge from upstream; update dependencies; bump version to 0.4.0