In a backward compatible manner, so that (I believe) we could move the discussion made in #25 forward. Fixes #25