Improve activities
Merge pull request #17 from nhattan/improve-activities

Improve activities