Merge pull request #3 from dhfromkorea/dev

collaborative cleanup