fix everything
Merge branch 'master' of https://github.com/klorophyl/cpsn