Merge branch '0.1.0' into 0.2.0