Final commits for 0.2