feature #3.
Merge pull request #3 from kjkuan/feature_3

feature #3.