Merge changes in default.rb from newest version