Merge pull request #24 from Esri/master

sync master and dev with help changes