update changes towards 0.3.1-SNAPSHOT