Fix issue #62 (and merging #64)