Adding last changes
Merge branch 'master' of github.com:jhlive/clima-org