Merge pull request #13 from brosander/1.3

1.3
PDI-9647 - Revisions based on Carter's testing