fix currentActivity update
Merge pull request #7 from arnaudbey/master

misc