Merge pull request #20 from scar712345/master

2014 07 21  中午進度