Merge pull request #5 from apache/develop

[MARVIN-19] Init PR to Master