janna's changes
Merge pull request #2 from kiwchang/ki_branch

Janna's changes