Issue #24
Merge conflict