Merge pull request #2 from Esri/master

Merge pull request #38 from Rrivera5127/master