diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index dbd4768..986ded9 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -862,6 +862,7 @@ to get illegal syntax when uncommenting them.
 
 2.1.15
     - added support for pamconf, thanks to Martin Kustermann
+    - added support for mason
 
 2.1.14
     - added support for gitconfig, tar, nerdtree
@@ -1252,3 +1253,4 @@ Christophe Benz                     services, gitcommit
 A Pontus                            vimperator
 Stromnov                            slice
 Martin Kustermann                   pamconf
+Indriði Einarsson                   mason
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 812c37b..4a615e5 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -1,5 +1,5 @@
 " vim global plugin that provides easy code commenting for various file types
-" Last Change:  17 May 2008
+" Last Change:  24 May 2008
 " Maintainer:   Martin Grenfell <martin_grenfell at msn.com>
 let s:NERD_commenter_version = 2.1.14
 
@@ -482,6 +482,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('<!--', '-->')
     elseif a:filetype == "masm" 
         call s:MapDelimiters(';', '')
+    elseif a:filetype == "mason"
+        call s:MapDelimiters('<% #', '%>')
     elseif a:filetype == "master" 
         call s:MapDelimiters('$', '')
     elseif a:filetype == "matlab"