Merge pull request #2 from steves880106/master

Merge pull request #1 from steves880106/filesend
Merge pull request #4 from steves880106/filesend

Merge pull request #2 from steves880106/master