Merge pull request #4 from apache/develop

update develop branch from Apache repo