diff --git a/src/editor/autocomplete.lua b/src/editor/autocomplete.lua
index 71f0a4853d..5e60196d0c 100644
--- a/src/editor/autocomplete.lua
+++ b/src/editor/autocomplete.lua
@@ -1,5 +1,7 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local statusBar = ide.frame.statusBar
 
diff --git a/src/editor/commands.lua b/src/editor/commands.lua
index ce3d868fb2..ff5334a680 100644
--- a/src/editor/commands.lua
+++ b/src/editor/commands.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local frame = ide.frame
 local notebook = frame.notebook
diff --git a/src/editor/debugger.lua b/src/editor/debugger.lua
index 6970f79161..0fee4915c2 100644
--- a/src/editor/debugger.lua
+++ b/src/editor/debugger.lua
@@ -1,7 +1,8 @@
--- Integration with MobDebug
--- Copyright 2011-13 Paul Kulchenko, ZeroBrane LLC
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- Original authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
+-- Integration with MobDebug
+---------------------------------------------------------
 
 local copas = require "copas"
 local socket = require "socket"
diff --git a/src/editor/editor.lua b/src/editor/editor.lua
index 60edeb3861..354d0c2e95 100644
--- a/src/editor/editor.lua
+++ b/src/editor/editor.lua
@@ -1,7 +1,8 @@
--- Copyright 2011-13 Paul Kulchenko, ZeroBrane LLC
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local editorID = 100 -- window id to create editor pages with, incremented for new editors
 
 local openDocuments = ide.openDocuments
diff --git a/src/editor/filetree.lua b/src/editor/filetree.lua
index 92fc3e4fd8..e3741fd408 100644
--- a/src/editor/filetree.lua
+++ b/src/editor/filetree.lua
@@ -1,5 +1,7 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 --
 -- filetree, treectrl for drive & project
diff --git a/src/editor/findreplace.lua b/src/editor/findreplace.lua
index 401dd1b69f..e115cfe25d 100644
--- a/src/editor/findreplace.lua
+++ b/src/editor/findreplace.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 ide.findReplace = {
   dialog = nil, -- the wxDialog for find/replace
diff --git a/src/editor/gui.lua b/src/editor/gui.lua
index 30485fc59c..bc74941408 100644
--- a/src/editor/gui.lua
+++ b/src/editor/gui.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 -- Lomtik Software (J. Winwood & John Labenski)
 ---------------------------------------------------------
+
 local ide = ide
 
 -- Pick some reasonable fixed width fonts to use for the editor
diff --git a/src/editor/ids.lua b/src/editor/ids.lua
index b93d3dc076..61f1fcc03a 100644
--- a/src/editor/ids.lua
+++ b/src/editor/ids.lua
@@ -1,3 +1,4 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 --          Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
diff --git a/src/editor/inspect.lua b/src/editor/inspect.lua
index eefaa9f1d7..c227e9d96c 100644
--- a/src/editor/inspect.lua
+++ b/src/editor/inspect.lua
@@ -1,5 +1,6 @@
+-- Copyright 2012-14 Paul Kulchenko, ZeroBrane LLC
 -- Integration with LuaInspect
--- (C) 2012 Paul Kulchenko
+---------------------------------------------------------
 
 local M, LA, LI, T = {}
 local FAST = true
diff --git a/src/editor/iofilters.lua b/src/editor/iofilters.lua
index bb1ac7195f..76e6135887 100644
--- a/src/editor/iofilters.lua
+++ b/src/editor/iofilters.lua
@@ -1,5 +1,7 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 
 ide.iofilters["GermanUtf8Ascii"] = {
diff --git a/src/editor/markup.lua b/src/editor/markup.lua
index d7880b2cbd..6eaf49e985 100644
--- a/src/editor/markup.lua
+++ b/src/editor/markup.lua
@@ -1,5 +1,6 @@
--- Copyright (C) Paul Kulchenko 2011-2012
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- styles for comment markup
+---------------------------------------------------------
 
 local MD_MARK_ITAL = '_' -- italic
 local MD_MARK_BOLD = '**' -- bold
diff --git a/src/editor/menu_edit.lua b/src/editor/menu_edit.lua
index 69e011b351..b59c48c714 100644
--- a/src/editor/menu_edit.lua
+++ b/src/editor/menu_edit.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 -- ---------------------------------------------------------------------------
 -- Create the Edit menu and attach the callback functions
diff --git a/src/editor/menu_file.lua b/src/editor/menu_file.lua
index 7a69c9ead2..f9ef755032 100644
--- a/src/editor/menu_file.lua
+++ b/src/editor/menu_file.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local frame = ide.frame
 local menuBar = frame.menuBar
diff --git a/src/editor/menu_help.lua b/src/editor/menu_help.lua
index 23d5ef7efc..ff3a84b176 100644
--- a/src/editor/menu_help.lua
+++ b/src/editor/menu_help.lua
@@ -1,5 +1,6 @@
--- author: Paul Kulchenko
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 ---------------------------------------------------------
+
 local ide = ide
 -- ---------------------------------------------------------------------------
 -- Create the Help menu and attach the callback functions
@@ -45,7 +46,7 @@ local function DisplayAbout(event)
 	  <tr>
 		<td>
 		<b>ZeroBrane Studio (%s; MobDebug %s)</b><br>
-		<b>Copyright &copy; 2011-2013 ZeroBrane LLC</b><br>
+		<b>Copyright &copy; 2011-2014 ZeroBrane LLC</b><br>
 		Paul Kulchenko<br>
 		Licensed under the MIT License.
 		</td>
diff --git a/src/editor/menu_project.lua b/src/editor/menu_project.lua
index 12a0de1ca4..b70011909a 100644
--- a/src/editor/menu_project.lua
+++ b/src/editor/menu_project.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local frame = ide.frame
 local menuBar = frame.menuBar
diff --git a/src/editor/menu_search.lua b/src/editor/menu_search.lua
index acf8844505..2c7bced2db 100644
--- a/src/editor/menu_search.lua
+++ b/src/editor/menu_search.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 -- Create the Search menu and attach the callback functions
 
diff --git a/src/editor/menu_tools.lua b/src/editor/menu_tools.lua
index 339fe4e40d..c777e56607 100644
--- a/src/editor/menu_tools.lua
+++ b/src/editor/menu_tools.lua
@@ -1,5 +1,7 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local frame = ide.frame
 local menuBar = frame.menuBar
diff --git a/src/editor/menu_view.lua b/src/editor/menu_view.lua
index 80ba0c4a68..27c8042348 100644
--- a/src/editor/menu_view.lua
+++ b/src/editor/menu_view.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local frame = ide.frame
 local menuBar = frame.menuBar
diff --git a/src/editor/output.lua b/src/editor/output.lua
index baf13b32fc..b93c049d9b 100644
--- a/src/editor/output.lua
+++ b/src/editor/output.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local frame = ide.frame
 local notebook = frame.notebook
diff --git a/src/editor/package.lua b/src/editor/package.lua
index acda53adc9..722850b891 100644
--- a/src/editor/package.lua
+++ b/src/editor/package.lua
@@ -1,4 +1,5 @@
--- Copyright 2013 Paul Kulchenko, ZeroBrane LLC
+-- Copyright 2013-14 Paul Kulchenko, ZeroBrane LLC
+---------------------------------------------------------
 
 local ide = ide
 local iscaseinsensitive = wx.wxFileName("A"):SameAs(wx.wxFileName("a"))
diff --git a/src/editor/proto.lua b/src/editor/proto.lua
index cb55225aaa..0489a75de8 100644
--- a/src/editor/proto.lua
+++ b/src/editor/proto.lua
@@ -1,4 +1,5 @@
--- Copyright 2013 Paul Kulchenko, ZeroBrane LLC
+-- Copyright 2013-14 Paul Kulchenko, ZeroBrane LLC
+---------------------------------------------------------
 
 ide.proto.Document = {__index = {
   GetFileName = function(self) return self.fileName end,
diff --git a/src/editor/settings.lua b/src/editor/settings.lua
index 82cdbeda27..6d3c28f2f9 100644
--- a/src/editor/settings.lua
+++ b/src/editor/settings.lua
@@ -1,6 +1,8 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 
 -- ----------------------------------------------------------------------------
diff --git a/src/editor/shellbox.lua b/src/editor/shellbox.lua
index 1e78acb611..c9ee18b558 100644
--- a/src/editor/shellbox.lua
+++ b/src/editor/shellbox.lua
@@ -1,5 +1,7 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 local unpack = table.unpack or unpack
 --
diff --git a/src/editor/singleinstance.lua b/src/editor/singleinstance.lua
index 721c4da0f0..de9c46e462 100644
--- a/src/editor/singleinstance.lua
+++ b/src/editor/singleinstance.lua
@@ -1,5 +1,7 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
+
 local ide = ide
 --[[ single instance
 open an UDP port - if it fails it is either because
diff --git a/src/editor/style.lua b/src/editor/style.lua
index 785dc22c87..c05f11c17b 100644
--- a/src/editor/style.lua
+++ b/src/editor/style.lua
@@ -1,4 +1,4 @@
--- Copyright 2011-13 Paul Kulchenko, ZeroBrane LLC
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
 ----------
diff --git a/src/main.lua b/src/main.lua
index cf35e2afc9..74646b19bb 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -1,3 +1,4 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
 
diff --git a/src/util.lua b/src/util.lua
index 9e2c578fd3..a13dc6ee1d 100644
--- a/src/util.lua
+++ b/src/util.lua
@@ -1,3 +1,4 @@
+-- Copyright 2011-14 Paul Kulchenko, ZeroBrane LLC
 -- authors: Lomtik Software (J. Winwood & John Labenski)
 -- Luxinia Dev (Eike Decker & Christoph Kubisch)
 -- David Manura