Merging sinatra into master