Merge pull request #2 from joannahwang/dev

Dev
fixed bugs and added one line.