updated docs
Merge remote-tracking branch 'origin/titan05' into titan05