pull code
merge
fix more bug
Merge branch 'master' of github.com:hohue/zerophp