Merge pull request #1 from pc0805a/master

屙
2014-9-24
Merge pull request #2 from pc0805jp/master

test pull request