Merged with new master
Merged designer.rb