tweaks and adding php socket version
currently broken python socket implementation
currently broken python socket implementation
resolve conflicts with master