Merge branch '0.2'