Ticket/15

Fixes #15.