diff --git a/lib/sammyjs-org.rb b/lib/sammyjs-org.rb
index fd4ebd4..99ee4ac 100644
--- a/lib/sammyjs-org.rb
+++ b/lib/sammyjs-org.rb
@@ -48,11 +48,10 @@ class SammyjsOrg < Sinatra::Application
     redirect "/docs/api/#{@current_version}/"
   end
 
-  get '/docs/api/?:version?/:page?' do
+  get '/docs/api/?:version?/?:page?' do
     @general_header = true
     @version = params[:version] || @current_version
     @page = params[:page] || 'index'
-    puts @page.inspect
     if @page =~ /\.html$/
       haml "= html('docs/api/#{@version}/#{@page}')", :layout => :simple
     else
diff --git a/public/images/sammy-logo.gif b/public/images/sammy-logo.gif
new file mode 100644
index 0000000..bae768b
Binary files /dev/null and b/public/images/sammy-logo.gif differ
diff --git a/views/docs.textile b/views/docs.textile
index 897df4d..6fb1c29 100644
--- a/views/docs.textile
+++ b/views/docs.textile
@@ -15,7 +15,7 @@ The API docs are generated from inline comments in the source. The API documenta
 
 *"View the documentation for the latest stable version":/docs/api/stable*
 
-*"View the API docs for master/edge":/docs/api/master*
+*"View the API docs for master/edge":/docs/api/master/*
 
 
 h3(#blocks). Building Blocks