Commit Jessica's changes
Merge pull request #8 from tcstool/master

Commit Jessica's changes