fixed
activities fixed
Merge pull request #88 from arieldiamond/still_fixing_params

Still fixing params