committed new change from fork.
Merge pull request #1 from joannahwang/dev

committed new change from fork.