Working on implementing feature request #22