merging in docs into alpha0.5