Merge pull request #2 from AaronLlanos/master

Part 1.3 Done