bugfix
Merge branch 'developer' of https://github.com/phpzero/phpzero into developer