Merge pull request #112 from saygoweb/pr/phpeditor