Feature2

Fixes #2