KFSTP-1637
Merge pull request #123 from smith750/KFSTP-1637

KFSTP-1637