0.0.2
adde docs
fixed merge