feature request #20 on github