more changes!
Merge pull request #39 from anniezhn/azhang

more changes!