diff --git a/README.md b/README.md
index 60143c5..84d0c94 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ submit a pull request (comment parsing happens in **lib/watson/paser.rb**)
 - **Go**
 - **Scala**
 - **Erlang**
+- **Elixir**
 - **Fortran**
 - **SQL / PL**
 - **Lua**
diff --git a/lib/watson/parser.rb b/lib/watson/parser.rb
index c3ca5d3..064b225 100755
--- a/lib/watson/parser.rb
+++ b/lib/watson/parser.rb
@@ -32,6 +32,8 @@ class Parser
         '.go'      => ['//', '/*'],        # Go(lang)
         '.scala'   => ['//', '/*'],        # Scala
         '.erl'     => ['%%', '%'],         # Erlang
+        '.ex'      => ['#'],               # Elixir
+        '.exs'     => ['#'],               # Elixir
         '.f'       => ['!'],               # Fortran
         '.f90'     => ['!'],               # Fortran
         '.F'       => ['!'],               # Fortran