Closed issue #15 (patch by oandrieu)