Issue14

Fixes #14