Merge pull request #435 from dlobo/master

Initial commit of changes for elimination of activities