@@ -13,40 +13,26 @@ public class InitializeTest
         public static void LoadSpecificArgs()
         {
             var args = new[] { "test1", "test2" };
-            PythonEngine.Initialize(args);
-            try
+            using (new PythonEngine(args))
+            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
-                using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
-                {
-                    Assert.That(argv[0].ToString() == args[0]);
-                    Assert.That(argv[1].ToString() == args[1]);
-                }
-            }
-            finally
-            {
-                PythonEngine.Shutdown();
+                Assert.That(argv[0].ToString() == args[0]);
+                Assert.That(argv[1].ToString() == args[1]);
             }
         }
 
         [Test]
         public static void LoadDefaultArgs()
         {
-            PythonEngine.Initialize();
-            try
-            {
-                using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
-                {
-                    Assert.That(argv.Length() != 0);
-                }
-            }
-            finally
+            using (new PythonEngine())
+            using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
             {
-                PythonEngine.Shutdown();
+                Assert.That(argv.Length() != 0);
             }
         }
 
         [Test]
-        public static void Test()
+        public static void StartAndStopTwice()
         {
             PythonEngine.Initialize();
             PythonEngine.Shutdown();
 
@@ -10,11 +10,31 @@ namespace Python.Runtime
     /// <summary>
     /// This class provides the public interface of the Python runtime.
     /// </summary>
-    public class PythonEngine
+    public class PythonEngine : IDisposable
     {
         private static DelegateManager delegateManager;
         private static bool initialized;
 
+        public PythonEngine()
+        {
+            Initialize();
+        }
+
+        public PythonEngine(params string[] args)
+        {
+            Initialize(args);
+        }
+
+        public PythonEngine(IEnumerable<string> args)
+        {
+            Initialize(args);
+        }
+
+        public void Dispose()
+        {
+            Shutdown();
+        }
+
         #region Properties
 
         public static bool IsInitialized
@@ -197,7 +217,8 @@ public static void Initialize(IEnumerable<string> args)
         // when it is imported by the CLR extension module.
         //====================================================================
 #if PYTHON3
-        public static IntPtr InitExt() {
+        public static IntPtr InitExt()
+        {
 #elif PYTHON2
         public static void InitExt()
         {
@@ -551,6 +572,11 @@ public static void SetArgv()
             );
         }
 
+        public static void SetArgv(params string[] argv)
+        {
+            SetArgv(argv as IEnumerable<string>);
+        }
+
         public static void SetArgv(IEnumerable<string> argv)
         {
             using (GIL())
Original file line number	Diff line number	Diff line change
@@ -13,40 +13,26 @@ public class InitializeTest
13	13	public static void LoadSpecificArgs()
14	14	{
15	15	var args = new[] { "test1", "test2" };
16		- PythonEngine.Initialize(args);
17		- try
	16	+ using (new PythonEngine(args))
	17	+ using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
18	18	{
19		- using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
20		- {
21		- Assert.That(argv[0].ToString() == args[0]);
22		- Assert.That(argv[1].ToString() == args[1]);
23		- }
24		- }
25		- finally
26		- {
27		- PythonEngine.Shutdown();
	19	+ Assert.That(argv[0].ToString() == args[0]);
	20	+ Assert.That(argv[1].ToString() == args[1]);
28	21	}
29	22	}
30	23
31	24	[Test]
32	25	public static void LoadDefaultArgs()
33	26	{
34		- PythonEngine.Initialize();
35		- try
36		- {
37		- using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
38		- {
39		- Assert.That(argv.Length() != 0);
40		- }
41		- }
42		- finally
	27	+ using (new PythonEngine())
	28	+ using (var argv = new PyList(Runtime.Runtime.PySys_GetObject("argv")))
43	29	{
44		- PythonEngine.Shutdown();
	30	+ Assert.That(argv.Length() != 0);
45	31	}
46	32	}
47	33
48	34	[Test]
49		- public static void Test()
	35	+ public static void StartAndStopTwice()
50	36	{
51	37	PythonEngine.Initialize();
52	38	PythonEngine.Shutdown();