Merging issue #131