Merge pull request #35 from bhutchinson/master

KFSTP-1419