Merge of PR #15