Merge #242