Merging issue #15