Merge pull request #2 from AaronLlanos/master

Part 1.3 Done
Merge pull request #3 from AaronLlanos/allanos

Merge pull request #2 from AaronLlanos/master