PDI-9647 - Revisions based on Carter's testing
Merge pull request #14 from brosander/1.3

PDI-9647 - Revisions based on Carter's testing