fixed a little twitter bug
Merge origin/master