sub func
Merge pull request #1 from vxer/master

merge pull req