Merge pull request #1 from limodou/master

update to the latest