Clarifications
Merge pull request #1 from TMiguelT/squash

Clarifications