Add feature-1 #7

Fixes #7