Implement enhancement [#49].