Merge pull request #79 from anniezhn/master

Catch up
Merge pull request #80 from anniezhn/master

Catch up
maybe this will work!
Merge pull request #81 from anniezhn/azhang

Azhang