Merge from Sinatra -- ready to deploy online