Migrate master to 0.2.0