diff --git a/ADF7021.cpp b/ADF7021.cpp
index b906f4a..cf44ab4 100644
--- a/ADF7021.cpp
+++ b/ADF7021.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *   Copyright (C) 2017 by Danilo DB4PLE 
  * 
  *   Some of the code is based on work of Guus Van Dooren PE1PLM:
diff --git a/ADF7021.h b/ADF7021.h
index 3806d7f..1b10245 100644
--- a/ADF7021.h
+++ b/ADF7021.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *   Copyright (C) 2017 by Danilo DB4PLE 
  *
  *   Some of the code is based on work of Guus Van Dooren PE1PLM:
diff --git a/BitRB.cpp b/BitRB.cpp
index de00b1f..0aa8ae5 100644
--- a/BitRB.cpp
+++ b/BitRB.cpp
@@ -1,7 +1,7 @@
 /*
 TX fifo control - Copyright (C) KI6ZUM 2015
 Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
-Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+Copyright (C) 2016,2017 by Andy Uribe CA6JAU
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
diff --git a/BitRB.h b/BitRB.h
index 7a240c3..a944cbe 100644
--- a/BitRB.h
+++ b/BitRB.h
@@ -1,7 +1,7 @@
 /*
 Serial fifo control - Copyright (C) KI6ZUM 2015
 Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
-Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public
diff --git a/DMRDMORX.cpp b/DMRDMORX.cpp
index 1159216..c3b0813 100644
--- a/DMRDMORX.cpp
+++ b/DMRDMORX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DMRDMORX.h b/DMRDMORX.h
index 4036e27..09a85d9 100644
--- a/DMRDMORX.h
+++ b/DMRDMORX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp
index e6b13c8..524749a 100644
--- a/DMRDMOTX.cpp
+++ b/DMRDMOTX.cpp
@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DMRDMOTX.h b/DMRDMOTX.h
index ce8459a..585e565 100644
--- a/DMRDMOTX.h
+++ b/DMRDMOTX.h
@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DStarRX.cpp b/DStarRX.cpp
index 5a8d170..ad8d248 100644
--- a/DStarRX.cpp
+++ b/DStarRX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DStarRX.h b/DStarRX.h
index 4eda77c..b6b17ac 100644
--- a/DStarRX.h
+++ b/DStarRX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DStarTX.cpp b/DStarTX.cpp
index 3cc5e00..25e0416 100644
--- a/DStarTX.cpp
+++ b/DStarTX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DStarTX.h b/DStarTX.h
index ee7666c..c3f0308 100644
--- a/DStarTX.h
+++ b/DStarTX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/Globals.h b/Globals.h
index 0f7659d..06b3c19 100644
--- a/Globals.h
+++ b/Globals.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/IO.cpp b/IO.cpp
index c908316..4584f59 100644
--- a/IO.cpp
+++ b/IO.cpp
@@ -1,6 +1,6 @@
 /*
- *   Copyright (C) 2015, 2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *   Copyright (C) 2017 by Danilo DB4PLE 
  
  *   This program is free software; you can redistribute it and/or modify
diff --git a/IO.h b/IO.h
index 8eda84d..69ce3a5 100644
--- a/IO.h
+++ b/IO.h
@@ -1,6 +1,6 @@
 /*
- *   Copyright (C) 2015, 2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *   Copyright (C) 2017 by Danilo DB4PLE 
  
  *   This program is free software; you can redistribute it and/or modify
diff --git a/IOArduino.cpp b/IOArduino.cpp
index 94e1bce..76ca11a 100644
--- a/IOArduino.cpp
+++ b/IOArduino.cpp
@@ -1,6 +1,6 @@
 /*
- *   Copyright (C) 2015, 2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *   Copyright (C) 2017 by Danilo DB4PLE 
  
  *   This program is free software; you can redistribute it and/or modify
diff --git a/IOSTM.cpp b/IOSTM.cpp
index 68c5611..50556b0 100644
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *   Copyright (C) 2017 by Danilo DB4PLE 
   
  *   This program is free software; you can redistribute it and/or modify
diff --git a/Makefile b/Makefile
index 4697f49..14b6cc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#  Copyright (C) 2016 by Andy Uribe CA6JAU
+#  Copyright (C) 2016,2017 by Andy Uribe CA6JAU
 #  Copyright (C) 2016 by Jim McLaughlin KI6ZUM
 
 #  This program is free software; you can redistribute it and/or modify
diff --git a/P25RX.cpp b/P25RX.cpp
index 3a14a03..47e7e30 100644
--- a/P25RX.cpp
+++ b/P25RX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/P25RX.h b/P25RX.h
index 3dbf31f..25eea77 100644
--- a/P25RX.h
+++ b/P25RX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/P25TX.cpp b/P25TX.cpp
index 5b2437c..48f688e 100644
--- a/P25TX.cpp
+++ b/P25TX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/P25TX.h b/P25TX.h
index bd14c7c..93b3290 100644
--- a/P25TX.h
+++ b/P25TX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/SerialArduino.cpp b/SerialArduino.cpp
index af23141..b4569f2 100644
--- a/SerialArduino.cpp
+++ b/SerialArduino.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/SerialSTM.cpp b/SerialSTM.cpp
index 7cff8af..0ce828e 100644
--- a/SerialSTM.cpp
+++ b/SerialSTM.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
- *   Copyright (C) 2016 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/YSFRX.cpp b/YSFRX.cpp
index f35c238..0aed910 100644
--- a/YSFRX.cpp
+++ b/YSFRX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/YSFRX.h b/YSFRX.h
index b65e382..435e314 100644
--- a/YSFRX.h
+++ b/YSFRX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/YSFTX.cpp b/YSFTX.cpp
index 5e047a2..9e01f55 100644
--- a/YSFTX.cpp
+++ b/YSFTX.cpp
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/YSFTX.h b/YSFTX.h
index 96f958f..fc80f63 100644
--- a/YSFTX.h
+++ b/YSFTX.h
@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016,2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/version.h b/version.h
index 669f52b..8b52f35 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by