Fixing cosmo.
Merge branch 'develop'