feature 2.
Merge pull request #2 from kjkuan/feature_2

feature 2.