Issue2

Fixes #3