Merge pull request #26 from admpub/master

update
Merge pull request #27 from admpub/master

improved
Merge pull request #3 from go-xweb/master

update