V.0.0.2

v.0.0.2 merge