Fixed broken link.
Updated documentation.
Merge branch 'master' into storage