Merge pull request #1 from AaronLlanos/master

Part 0 Done
done
Merge pull request #1 from tarik90/master

1.2 Done