Merge pull request #2 from p3dr0migue1/master

Merge pull request #1 from p3dr0migue1/testing
Merge pull request #6 from p3dr0migue1/testing

Merge pull request #2 from p3dr0migue1/master