diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 Usage
 -----
 
-Cgrep 6.6.13. Usage: cgrep [OPTION] [PATTERN] files...
+Cgrep 6.6.14. Usage: cgrep [OPTION] [PATTERN] files...
 
 cgrep [OPTIONS] [ITEM]
 
diff --git a/cgrep.cabal b/cgrep.cabal
--- a/cgrep.cabal
+++ b/cgrep.cabal
@@ -1,6 +1,6 @@
 Name:                cgrep
 Description:         Cgrep: a context-aware grep for source codes
-Version:             6.6.13
+Version:             6.6.14
 Synopsis:            Command line tool
 Homepage:            http://awgn.github.io/cgrep/
 License:             GPL-2
diff --git a/src/CGrep/Filter.hs b/src/CGrep/Filter.hs
--- a/src/CGrep/Filter.hs
+++ b/src/CGrep/Filter.hs
@@ -188,8 +188,9 @@
 
 
 filterFunctionMap = Map.fromList
-    [   (Awk,        mkContextFilterFun [("#", "\n")]  [("\"", "\"")] )
-    ,   (C,         mkContextFilterFun [("/*", "*/"), ("//", "\n")]  [("\"", "\"")] )
+    [   (Assembly,   mkContextFilterFun [("#", "\n"), (";", "\n"), ("|", "\n"), ("!", "\n"), ("/*", "*/")]  [("\"", "\"")] )
+    ,   (Awk,        mkContextFilterFun [("#", "\n")]  [("\"", "\"")] )
+    ,   (C,          mkContextFilterFun [("/*", "*/"), ("//", "\n")]  [("\"", "\"")] )
     ,   (CMake,      mkContextFilterFun [("#", "\n")]  [("\"", "\"")] )
     ,   (Cabal,      mkContextFilterFun [("--", "\n")] [("\"", "\"")] )
     ,   (Chapel,     mkContextFilterFun [("/*", "*/"), ("//", "\n")]  [("\"", "\"")] )
diff --git a/src/CGrep/Lang.hs b/src/CGrep/Lang.hs
--- a/src/CGrep/Lang.hs
+++ b/src/CGrep/Lang.hs
@@ -28,8 +28,8 @@
 import Options
 import Util
 
-data Lang = Awk  | C | CMake | Cabal | Chapel | Clojure | Coffee | Conf | Cpp  | Csharp | Css |
-            D | Elixir | Erlang | Fsharp | Go | Haskell | Html | Idris | Java | Javascript | Latex |
+data Lang = Assembly | Awk  | C | CMake | Cabal | Chapel | Clojure | Coffee | Conf | Cpp  | Csharp | Css |
+            D | Elixir | Erlang | Fortran | Fsharp | Go | Haskell | Html | Idris | Java | Javascript | Latex |
             Lua | Make | OCaml | ObjectiveC | PHP | Perl | Python | Ruby | Scala | Shell | Tcl |
             Text | VHDL | Verilog | Vim
                 deriving (Read, Show, Eq, Ord, Bounded)
@@ -50,7 +50,8 @@
 
 langMap :: LangMapType
 langMap = Map.fromList
-    [  (Awk,       [Ext "awk", Ext "mawk", Ext "gawk"])
+    [  (Assembly,  [Ext "s", Ext "S"])
+    ,  (Awk,       [Ext "awk", Ext "mawk", Ext "gawk"])
     ,  (C,         [Ext "c", Ext "C"])
     ,  (CMake,     [Name "CMakeLists.txt", Ext "cmake"])
     ,  (Cabal,     [Ext "cabal"])
@@ -58,12 +59,17 @@
     ,  (Clojure,   [Ext "clj", Ext "cljs", Ext "cljc", Ext "edn"])
     ,  (Coffee,    [Ext "coffee"])
     ,  (Conf,      [Ext "config", Ext "conf", Ext "cfg", Ext "doxy"])
-    ,  (Cpp,       [Ext "cpp", Ext "CPP", Ext "cxx", Ext "cc", Ext "cp", Ext "tcc", Ext "h", Ext "H", Ext "hpp", Ext "ipp", Ext "HPP", Ext "hxx", Ext "hh", Ext "hp"])
+    ,  (Cpp,       [Ext "cpp", Ext "CPP", Ext "cxx", Ext "cc", Ext "cp", Ext "c++", Ext "tcc",
+                    Ext "h", Ext "H", Ext "hpp", Ext "ipp", Ext "HPP", Ext "hxx", Ext "hh", Ext "hp", Ext "h++"])
     ,  (Csharp,    [Ext "cs", Ext "CS"])
     ,  (Css,       [Ext "css"])
     ,  (D,         [Ext "d", Ext "D"])
     ,  (Elixir,    [Ext "ex", Ext "exs"])
     ,  (Erlang,    [Ext "erl", Ext "ERL",Ext "hrl", Ext "HRL"])
+    ,  (Fortran,   [Ext "f", Ext "for", Ext "ftn",
+                    Ext "F", Ext "FOR", Ext "FTN", Ext "fpp", Ext "FPP",
+                    Ext "f90", Ext "f95", Ext "f03", Ext "f08",
+                    Ext "F90", Ext "F95", Ext "F03", Ext "F08"])
     ,  (Fsharp,    [Ext "fs", Ext "fsx", Ext "fsi"])
     ,  (Go,        [Ext "go"])
     ,  (Haskell,   [Ext "hs", Ext "lhs", Ext "hsc"])