Merge pull request #3 from erinmclaughlin/changes03

Changes03