Merge pull request #128 from Esri/development

Merging pull requests from dev branch to master.
Merge branch 'gh-pages'