Merge pull request #1 from songful/master

pull
Merge pull request #1 from alphaforce/master

Merge pull request #1 from songful/master