Merge pull request #57 from roadan/AMATERASU-36-mesos

Amaterasu 36 mesos