Merge pull request #13 from apache/develop

merge develop to 0.1.x