Issue7

Fixes #7