Fixes #19

See description in #19