Merge pull request #2 from rschooley/master

Merge pull request #1 from rschooley/new
Merge pull request #3 from rschooley/new

Merge pull request #2 from rschooley/master