Need to pick a name for the team
Merge branch 'master' of https://github.com/Rolom/medusa

# By chantez
# Via chantez
* 'master' of https://github.com/Rolom/medusa:
  fixed some deep messages