Added documentation
Merge branch 'master' into anticache