Merge pull request #1 from monkeyphp/develop

Merge develop into master
Merge pull request #2 from monkeyphp/master

Merge pull request #1 from monkeyphp/develop