final beta
Merge pull request #7 from nearmeng/master

update