Merge pull request #22 from scar712345/master

2014 07 21  下午進度
Merge pull request #5 from yume190/master

Merge pull request #22 from scar712345/master