random sinatra goodness
merge