Update to 0.4.0-SNAPSHOT