joe helps out
Merge pull request #2 from XinheF/master

joe helps out