Issue #229
Merge