Add validation
add 'share'
Merge remote-tracking branch 'origin/master'