Merge pull request #1 from dca/master

手邊翻出來的草稿