Final code
Merge pull request #1 from mabar207/master

Final code