Merge branch '0.3.0'