Added a new feature
Fixes #4