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

Improve activities