Merge pull request #10 from xiejunfeng/master

update
update ... a lot
fix conflicts
update

update