Fix issue #52 . timtimo++