now works with sinatra
Merge