updates 0.2 merged