Merge pull request #4 from markhamstra/master-csd

Catching up with Apache branch-0.8