Update to 0.3.1 SNAPSHOT