diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index c1cd01a..db047be 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -861,14 +861,16 @@ to get illegal syntax when uncommenting them.
 8. Changelog                                                *NERDComChangelog*
 
 2.1.8
-    - added an alternative set of delims for the plsql filetype, thx to Kuchma
-      Michael
-    - added support for spectre, thx to Brett Warneke
     - fixed a bug that was screwing up the removal of spaces when
-      NERDSpaceDelims was set. Thx to David Miani for posting the issue.
+      NERDSpaceDelims was set. Thx to David Miani for posting the issue
     - fixed a bug with aligned comments and the NERDSpaceDelims option, thx to
       Jeremy Hinegardner
     - added dummy support for lhaskell, thx to pipp for posting the issue
+    - added an alternative set of delims for the plsql filetype, thx to Kuchma
+      Michael
+    - added support for spectre, thx to Brett Warneke
+    - added support for scala, thx to Renald Buter
+    - added support for asymptote, thx to Vladimir Lomov
     
 
 2.1.7
@@ -1185,3 +1187,5 @@ Laurent ARNOUD                      asterisk
 Kuchma Michael                      plsql
 Brett Warneke                       spectre
 Pipp                                lhaskell
+Renald Buter                        scala
+Vladimir Lomov                      asymptote
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 3f95859..cbab400 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -166,6 +166,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('''', '')
     elseif a:filetype == "asterisk" 
         call s:MapDelimiters(';', '')
+    elseif a:filetype == "asy" 
+        call s:MapDelimiters('//', '')
     elseif a:filetype == "atlas" 
         call s:MapDelimiters('C','$') 
     elseif a:filetype == "autohotkey" 
@@ -622,6 +624,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimitersWithAlternative('//','', '/*', '')
     elseif a:filetype == "sather" 
         call s:MapDelimiters('--', '')
+    elseif a:filetype == "scala" 
+        call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "scheme" 
         call s:MapDelimiters(';', '')
     elseif a:filetype == "scilab"