Change based on meeting with client
Merge pull request #33 from pabloivan57/Group

Change based on meeting with client