update
Merge pull request #2 from beego/master

update