diff --git a/History.txt b/CHANGELOG
similarity index 100%
rename from History.txt
rename to CHANGELOG
diff --git a/License.txt b/LICENSE
similarity index 95%
rename from License.txt
rename to LICENSE
index 3633bbf..64af62f 100644
--- a/License.txt
+++ b/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2008 Craig P Jolicoeur
+Copyright (c) 2008 Craig P Jolicoeur, Fernando Blat
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..3f9274c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,108 @@
+# BBRuby
+
+* [http://rubygems.org/gems/bb-ruby](http://rubygems.org/gems/bb-ruby)
+
+## Description:
+
+BBRuby is a [BBCode](http://www.bbcode.org) implementation for Ruby. It will convert strings with BBCode markup to their HTML equivalent.
+
+## Installation:
+
+ gem install bb-ruby
+
+
+## Usage:
+
+ require 'bb-ruby'
+
+BBRuby has been included directly into the String class for use on any string object:
+
+ text = "[b]Here is some bold text[/b] followed by some [u]underlined text[/u]"
+ output = text.bbcode_to_html
+ text.bbcode_to_html!
+
+BBRuby will auto-escape HTML tags. To prevent this just pass false as the second param:
+
+ output = text.bbcode_to_html({}, false)
+
+Only allow certain tags:
+
+ output = text.bbcode_to_html({}, true, :enable, :image, :bold, :quote)
+
+Disable certain tags:
+
+ output = text.bbcode_to_html({}, true, :disable, :image, :bold, :quote)
+
+Alternative Direct usage:
+
+ output = BBRuby.to_html(bbcode_markup)
+
+Define your own translation, in order to be more flexible:
+
+ my_blockquote = {
+ 'Quote' => [
+ /\[quote(:.*)?=(.*?)\](.*?)\[\/quote\1?\]/mi,
+ '',
+ 'Quote with citation',
+ '[quote=mike]please quote me[/quote]',
+ :quote
+ ],
+ }
+
+ text.bbcode_to_html(my_blockquote)
+
+Define Proc as replacement:
+
+ module BBRuby
+ @@tags = @@tags.merge({
+ 'File' => [
+ /\[file(:.*)?=(.*?)\](.*?)\[\/file\1?\]/mi,
+ lambda{ |e| "#{e[3]}
#{file_read_method(e[2])}
#{e[3]}
#{file_read_method(e[2])}