Merge pull request #516 from m-a-d-n-e-s-s/515-rmi-can-break-down-whe…

Merge pull request #516 from m-a-d-n-e-s-s/515-rmi-can-break-down-whe… #163