function
Merge pull request #2 from leon1111/master

function