Merge #224 patch