This reverts merge request !44 (merged)
Reverted the wrong merge request. Trying to revert the revert.