exercise 1
Merge https://github.com/dgarciaho/exercise1