Merge pull request #2 from Esri/master

Merge pull request #38 from Rrivera5127/master
Merge pull request #39 from Rrivera5127/master

Merge pull request #2 from Esri/master