Merging issue #124.