feature request #21 on github