Preparing for 0.4 (SNAPSHOT)