Joel changes

my changes
Merge pull request #3 from ylee178/Joel

Joel changes