Merge pull request #22 from scar712345/master

2014 07 21  下午進度