Completed the functionality
Merge pull request #19 from tcharles411/master

Group 3 Submission