TODO: update for 0.2.0 release