Update and fix #30 for new sinatra