Updated for Sinatra 1.4.2