diff --git a/bin/zerobufCxx.py b/bin/zerobufCxx.py
index 3dafb5b..6bd57d2 100755
--- a/bin/zerobufCxx.py
+++ b/bin/zerobufCxx.py
@@ -198,14 +198,22 @@ def write_declaration(self, file):
     def write_implementation(self, file, classname=None, extra_op = ""):
         if not self.split_implementation:
             return
-
+        has_final = re.compile(r" final$").match(self.function)
+        
         impl_function = re.sub(r" final$", "", self.function) # remove ' final' keyword
         impl_function = re.sub(r" = [0-9\.f]+ ", " ", impl_function) # remove default params
 
         next_line(file)
+        
         if self.ret_val: # '{}'-less body
-            file.write('{0} {1}{2}\n{{'.format(self.ret_val,
-                (classname + '::') if classname else '', impl_function))
+            add_before_inline = ""
+            add_after_inline = ""
+            if inline_implementation:
+                add_before_inline = "inline " if not (self.ret_val.startswith("template<>") or has_final) else ""
+                add_after_inline = "inline " if self.ret_val.startswith("template<>") and not (has_final) else ""
+            
+            file.write('{0}{1} {2}{3}{4}\n{{'.format(add_before_inline, self.ret_val, 
+                add_after_inline, (classname + '::') if classname else '', impl_function))
             next_line_indent(file)
             file.write(self.body)
             if extra_op:
@@ -214,7 +222,10 @@ def write_implementation(self, file, classname=None, extra_op = ""):
             next_line(file)
             file.write('}')
         else:      # ctor '[initializer list]{ body }'
-            file.write('{0}{1}'.format((classname + '::') if classname else '',
+            add_inline = ""
+            if inline_implementation:
+                add_inline = "inline "
+            file.write('{0}{1}{2}'.format(add_inline, (classname + '::') if classname else '',
                                         impl_function))
             next_line_indent(file)
             file.write(self.body)