merge as suggested in #2