Merge pull request #20 from scar712345/master

2014 07 21  中午進度
Merge pull request #3 from yume190/master

Merge pull request #20 from scar712345/master