Changed things around a bit
Merge pull request #21 from anniezhn/azhang

Changed things around a bit