Merge pull request #52 from roadan/AMATERASU-79

Amaterasu 79