Fixing Things

Fixing things.
Merge branch 'master' of https://github.com/fmcat/CSN