V 2.0.6

polished by bjw