Ticket #467 (see Trac)
Merge pull request #31 from ehenneken/ticket_467

Ticket #467 (see Trac)