Fixes #468

@gregcaporaso This should be the interface changes you requested.