Merge pull request #17 from BryanGillette/Branch19

Branch19