Merge pull request #1 from tarik90/master

1.2 Done
Part 1.4 Done
Merge pull request #2 from AaronLlanos/master

pulling