update from google code
Merge branch 'master' of https://github.com/obingo/pb4php