Merge pull request #1 from stacyduval/1.0

Changes I made during Contributor Day.