Merge pull request #92 from apache/develop

Merging dev changes to master