Merge branch 'master' of https://github.com/jkaufy/CartoCosmos-1