Merge pull request #19 from markhamstra/master-csd

SKIPME Pickup recent bug fixes from Apache branch-0.9