Add control for share
Merge branch 'master'