Added some more security to this feature
Merge branch 'hotfix/v2.0.0-fix-tweet-script'