diff --git a/sklearn_porter/Porter.py b/sklearn_porter/Porter.py
index 29ec5d43..81a5e09b 100644
--- a/sklearn_porter/Porter.py
+++ b/sklearn_porter/Porter.py
@@ -469,7 +469,7 @@ def _get_filename(class_name, language):
         lang = str(language)
 
         # Name:
-        if language == 'java':
+        if language in ['java', 'php']:
             name = name.capitalize()
 
         # Suffix:
@@ -513,7 +513,9 @@ def _get_commands(filename, class_name, language):
             # gcc brain.c -o brain
             'c': 'gcc {} -lm -o {}'.format(fname, cname),
             # javac Brain.java
-            'java': 'javac {}'.format(fname)
+            'java': 'javac {}'.format(fname),
+            # go build -o brain brain.go
+            'go': 'go build -o {} {}.go'.format(cname, cname)
         }
         comp_cmd = comp_vars.get(lang, None)
 
@@ -525,10 +527,12 @@ def _get_commands(filename, class_name, language):
             'java': 'java -classpath . {}'.format(cname.capitalize()),
             # node brain.js
             'js': 'node {}'.format(fname),
-            # php -f brain.php
-            'php': 'php -f {}'.format(fname),
+            # php -f Brain.php
+            'php': 'php -f {}'.format(cname.capitalize()),
             # ruby brain.rb
-            'ruby': 'ruby {}'.format(fname)
+            'ruby': 'ruby {}'.format(fname),
+            # ./brain
+            'go': os.path.join('.', cname),
         }
         exec_cmd = exec_vars.get(lang, None)