just merging changes from phpstack into pythonstack