edjiang Merge pull request #1 from mc10/patch-1