diff --git a/README.md b/README.md
index c7abdc9a0d2..e27d8b3a2d2 100644
--- a/README.md
+++ b/README.md
@@ -722,7 +722,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [DocRaptor](https://docraptor.com)
 - [DocuSign](https://www.docusign.com)
 - [Ergon](http://www.ergon.ch/)
-- [EMC](https://www.emc.com/)
+- [Dell EMC](https://www.emc.com/)
 - [eureka](http://eure.jp/)
 - [everystory.us](http://everystory.us)
 - [Expected Behavior](http://www.expectedbehavior.com/)
@@ -874,6 +874,7 @@ Here is a list of template creators:
    * Elixir: @niku
    * Groovy: @victorgit
    * Go: @wing328
+   * Go (rewritten in 2.3.0): @antihax
    * Java (Feign): @davidkiss
    * Java (Retrofit): @0legg
    * Java (Retrofi2): @emilianobonassi