addition scalability
Merge branch 'master' of https://github.com/TweetAggregator/TweetAggregator