merge working php into master