Issue8

Fixes #8