Merge pull request #6 from jhartlaub/shark-0.9-csd-9

Shark 0.9 csd 9