Combine php55 and php54
Update readme and sample