Issue20

Fixes #20