Merge pull request #128 from Esri/development

Merging pull requests from dev branch to master.
Merge pull request #129 from Esri/development

Development
Merge branch 'development' into gh-pages
Merge branch 'gh-pages'