This is an enhancement

Fixes #1