Initial support of sharing
Merge branch 'master' into gh-pages