More comfortable merge #1