Merge pull request #1 from rschooley/new

two:
Merge pull request #2 from rschooley/master

Merge pull request #1 from rschooley/new