Merge pull request #26 from rotty3000/ARIES-1958

Aries 1958