Adams contribution
Merge pull request #4 from ahavila14/master

Adams contribution