EDING
Merge pull request #1 from CharliePhang/dev

EDING