Merge branch 'master' into support_for_sinatra_apps
make this more robust
Merge branch 'support_for_sinatra_apps'