Reopen for https://github.com/sanel/monroe/pull/6
Reopen for #6