Improvements to a better activity recreation support
Merge pull request #42 from maxirosson/dev

Improvements to a better activity recreation support