Fixed docs
Merge Master