Merge pull request #1 from edsu/master

jin-ja in the house
Merge pull request #2 from edsu/master

small text change