fixes
Merge branch 'master' of ssh://git@github.com/cthorburn/cog.git