Merge pull request #1025 from danrl/cshark