Feature

As in discussion for #9