Fixed Ruby 4 conflicts & added user name