enhancement: fixed #15