But we haven't decided if we want to merge #261, maybe there is a better approach. 
In order to merge this PR we should remove these changes.