More changes
Merge pull request #27 from anniezhn/azhang

More changes