Merge pull request #21 from markhamstra/master-csd

Merge 0.8.0-candidate-csd branch to master-csd