Merge pull request #1 from og8/feature/001

feature/001 1st commit　
This is master's diff.