Changes to facilitate merge
Merge pull request #28 from ayshih/test

Changes to facilitate merge