Merge pull request #1 from rajeenthini/master

Context Completed
Merge pull request #2 from rajeenthini/master

Location Completed
Goals completed
Merge pull request #1 from dinithiviranga/master

goals completed