Revert "Revert "Merge pull request #26 from alelr36/MUT-024""

This reverts commit 01f6757e118978137d8c9f2ea0998a7a6982f1fa.