Fix a poor merge (for pull request #43)
Merge