Merge pull request #3 from fu-task/master

merge