Merge of issue #1