Merge pull request #35 from markhamstra/master-csd

Updated tachyon