A few changes
Merge branch 'TwitterAPI' of https://github.com/dzamurovic/strato-playground into TwitterAPI