Merge pull request #1 from stfy86/master

stfy pull
Merge pull request #2 from stfy86/stfy

Merge pull request #2 from stfy86/master