diff --git a/AUTHORS b/AUTHORS
index 00a5705406..e7078c2ddc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -64,3 +64,4 @@ Armin Wehrfritz (@awehrfritz)
 Richard West (@rwest), Northeastern University
 Chao Xu (@12Chao), Northeastern University
 Thorsten Zirwes (@g3bk47), Karlsruhe Institute of Technology
+Su Sun (@ssun30), Northeastern University
diff --git a/interfaces/matlab/toolbox/@ThermoPhase/private/phase_get.m b/interfaces/matlab/toolbox/@ThermoPhase/private/phase_get.m
index 0a2d17e6d3..28acd9c2f4 100644
--- a/interfaces/matlab/toolbox/@ThermoPhase/private/phase_get.m
+++ b/interfaces/matlab/toolbox/@ThermoPhase/private/phase_get.m
@@ -5,4 +5,4 @@
     i = ctmethods(30, n, job, a);
 else
     i = ctmethods(30, n, job, a, b);
-end
\ No newline at end of file
+end
diff --git a/interfaces/matlab/toolbox/@ThermoPhase/private/phase_set.m b/interfaces/matlab/toolbox/@ThermoPhase/private/phase_set.m
index 7c5b9bb602..186590936f 100644
--- a/interfaces/matlab/toolbox/@ThermoPhase/private/phase_set.m
+++ b/interfaces/matlab/toolbox/@ThermoPhase/private/phase_set.m
@@ -5,4 +5,4 @@ function phase_set(n, job, a, b)
     ctmethods(30, n, -job, a);
 else
     ctmethods(30, n,-job, a, b);
-end
\ No newline at end of file
+end
diff --git a/interfaces/matlab/toolbox/@ThermoPhase/private/thermo_set.m b/interfaces/matlab/toolbox/@ThermoPhase/private/thermo_set.m
index 6377c4bc05..b4ca7e2d86 100644
--- a/interfaces/matlab/toolbox/@ThermoPhase/private/thermo_set.m
+++ b/interfaces/matlab/toolbox/@ThermoPhase/private/thermo_set.m
@@ -13,4 +13,4 @@
     i = ctmethods(20, n, -job, a, b, c, d, e);
 elseif nargin == 8
     i = ctmethods(20, n, -job, a, b, c, d, e, f);
-end
\ No newline at end of file
+end
diff --git a/samples/matlab/ignite_hp.m b/samples/matlab/ignite_hp.m
index 506cd3ae6c..e8c9b1d97b 100644
--- a/samples/matlab/ignite_hp.m
+++ b/samples/matlab/ignite_hp.m
@@ -7,7 +7,7 @@ function ignite_hp(gas)
 help ignite_hp
 
 if nargin == 0
-   gas = Solution('h2o2.yaml', 'gas', 'None');
+   gas = Solution('h2o2.yaml', 'ohmech', 'None');
 end
 
 mw = molecularWeights(gas);
diff --git a/samples/matlab/ignite_uv.m b/samples/matlab/ignite_uv.m
index 2a33313e1e..c1d718add6 100644
--- a/samples/matlab/ignite_uv.m
+++ b/samples/matlab/ignite_uv.m
@@ -7,7 +7,7 @@ function ignite_uv(gas)
 help ignite_uv
 
 if nargin == 0
-   gas = Solution('h2o2.yaml', 'gas', 'None');
+   gas = Solution('h2o2.yaml', 'ohmech', 'None');
 end
 
 mw = molecularWeights(gas);
diff --git a/samples/matlab/prandtl1.m b/samples/matlab/prandtl1.m
index a4be4a49e6..3aadcd85b9 100644
--- a/samples/matlab/prandtl1.m
+++ b/samples/matlab/prandtl1.m
@@ -12,7 +12,7 @@ function prandtl1(g)
 if nargin == 1
    gas = g;
 else
-   gas = Solution('h2o2.yaml', 'gas', 'Mix');
+   gas = Solution('h2o2.yaml', 'ohmech', 'Mix');
 end
 
 pr = zeros(31,31);
diff --git a/samples/matlab/prandtl2.m b/samples/matlab/prandtl2.m
index 8b11928627..e8b8dda2c3 100644
--- a/samples/matlab/prandtl2.m
+++ b/samples/matlab/prandtl2.m
@@ -11,7 +11,7 @@ function prandtl2(g)
 if nargin == 1
    gas = g;
 else
-   gas = Solution('h2o2.yaml', 'gas', 'Multi');
+   gas = Solution('h2o2.yaml', 'ohmech', 'Multi');
 end
 
 pr = zeros(31,31);
diff --git a/samples/matlab/reactor1.m b/samples/matlab/reactor1.m
index 4d11aa8c7d..035be3f5cd 100644
--- a/samples/matlab/reactor1.m
+++ b/samples/matlab/reactor1.m
@@ -16,7 +16,7 @@ function reactor1(g)
 if nargin == 1
    gas = g;
 else
-   gas = Solution('h2o2.yaml', 'gas', 'None');
+   gas = Solution('h2o2.yaml', 'ohmech', 'None');
 end
 
 P = oneatm;
diff --git a/samples/matlab/reactor2.m b/samples/matlab/reactor2.m
index 04277145e4..6c2c863625 100644
--- a/samples/matlab/reactor2.m
+++ b/samples/matlab/reactor2.m
@@ -12,7 +12,7 @@ function reactor2(g)
 if nargin == 1
    gas = g;
 else
-   gas = Solution('h2o2.yaml', 'gas', 'None');
+   gas = Solution('h2o2.yaml', 'ohmech', 'None');
 end
 
 % set the initial conditions
diff --git a/samples/matlab/surfreactor.m b/samples/matlab/surfreactor.m
index 64cfcb0fcd..36dce2d379 100644
--- a/samples/matlab/surfreactor.m
+++ b/samples/matlab/surfreactor.m
@@ -57,9 +57,9 @@
 p0 = pressure(r);
 names = {'CH4','CO','CO2','H2O'};
 x = zeros([nSteps 4]);
-tim = zeros(nSteps);
-temp = zeros(nSteps);
-pres = zeros(nSteps);
+tim = zeros(nSteps, 1);
+temp = zeros(nSteps, 1);
+pres = zeros(nSteps, 1);
 cov = zeros([nSteps nSurfSp]);
 t = 0;
 dt = 0.1;
diff --git a/samples/matlab/test_examples.m b/samples/matlab/test_examples.m
index b1c6bf7531..60a0105e6d 100644
--- a/samples/matlab/test_examples.m
+++ b/samples/matlab/test_examples.m
@@ -1,12 +1,29 @@
 % runs selected examples without pausing
+
+clear all
+close all
+cleanup
+
 equil();
 isentropic();
 reactor1();
 reactor2();
 surfreactor;
 periodic_cstr;
+Plug_Flow_Reactor;
+lithium_ion_battery
 rankine(300.0, 2.0*oneatm, 0.8, 0.7);
 prandtl1();
+prandtl2();
 flame1;
+flame2;
 catcomb;
-exit;
+clear all
+close all
+diffflame;
+ignite_hp;
+ignite_uv;
+
+clear all
+close all
+cleanup