Update to 0.2, still not ready for RC