Merge pull request #5 from markhamstra/shark-0.9-csd

Revert 3