python
merged fixed php/python combining