for accepted pull #18