Support for cosmos
Merge branch 'master' of https://github.com/inf-rno/machack2014