Fixes issue 14

Fixes #14