Merge pull request #6 from lmacha02/master

Merge pull request #1 from cheile01/master
Merge pull request #2 from cheile01/master

Merge pull request #6 from lmacha02/master