Ticket 56

Fixes #56