beta 2.0.2 merged