Merge pull request #6 from markhamstra/master-csd

Bringing CSD changes to master/0.3