Merge branch 'master' of github.com:hakushi/oophp
Merge branch 'master' of github.com:hakushi/oophp
fix