Merge #1 changes