Merge pull request #23 from markhamstra/master-csd

SPY-350 and catching up to Apache branch-0.9