Merge pull request #1 from apploft/Update

Update
Merge pull request #2 from apploft/Update

Update activity type
Merge pull request #3 from apploft/Update

Fixes and refactoring