Merge pull request #2 from YfLn/master