Merge pull request #8 from markhamstra/master-csd

Syncing up with AMPLab 0.3.0 release