Merge release 0.2 from testing