Apply changes proposed in #29