Fix twitter bug
Merge branch 'refs/heads/develop'