fb and tw
Activity bug
Fixes
Merge pull request #2 from arshadansari27/master

Updating from Arshad