Merge pull request #22 from apache/develop

Dev -> Master