Merge pull request #17 from BryanGillette/Branch19

Branch19
Merge pull request #31 from BryanGillette/Branch20

Merge pull request #17 from BryanGillette/Branch19