Feature/merge pullrequest eredding-rmn