Moving towards 0.2.1