I think we can delegate this to issue #39