Merge from tag 0.3.2 to 0.4.0-SNAPSHOT