Apply changes suggested in #15