diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDependency.java b/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDependency.java
index 2d1887e..d6a2032 100644
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDependency.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/PluginDependency.java
@@ -20,7 +20,7 @@ import com.github.zafarkhaja.semver.Version;
 public class PluginDependency {
 
     private String pluginId;
-    private String pluginVersionSupport;
+    private String pluginVersionSupport = "*";
 
     public PluginDependency(String dependency) {
         int index = dependency.indexOf('@');
@@ -29,7 +29,9 @@ public class PluginDependency {
         } else {
 
             this.pluginId = dependency.substring(0, index);
-            this.pluginVersionSupport = dependency.substring(index + 1);
+            if (dependency.length() > index + 1) {
+                this.pluginVersionSupport = dependency.substring(index + 1);
+            }
         }
     }
 
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinderTest.java b/pf4j/src/test/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinderTest.java
index 5038f66..459d123 100644
--- a/pf4j/src/test/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinderTest.java
+++ b/pf4j/src/test/java/ro/fortsoft/pf4j/ManifestPluginDescriptorFinderTest.java
@@ -18,8 +18,6 @@ package ro.fortsoft.pf4j;
 import com.github.zafarkhaja.semver.Version;
 import java.io.File;
 import java.net.URL;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -31,14 +29,6 @@ import static org.junit.Assert.assertTrue;
  */
 public class ManifestPluginDescriptorFinderTest {
 
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
     /**
      * Test of find method, of class ManifestPluginDescriptorFinder.
      */
diff --git a/pf4j/src/test/java/ro/fortsoft/pf4j/PluginDependencyTest.java b/pf4j/src/test/java/ro/fortsoft/pf4j/PluginDependencyTest.java
new file mode 100644
index 0000000..c8bc63b
--- /dev/null
+++ b/pf4j/src/test/java/ro/fortsoft/pf4j/PluginDependencyTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 Mario Franco.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ro.fortsoft.pf4j;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ *
+ * @author Mario Franco
+ */
+public class PluginDependencyTest {
+
+    /**
+     * Test of getPluginId method, of class PluginDependency.
+     */
+    @Test
+    public void testPluginDependecy() {
+        PluginDependency instance = new PluginDependency("test");
+        assertEquals("test", instance.getPluginId());
+        assertEquals("*", instance.getPluginVersionSupport());
+
+        instance = new PluginDependency("test@");
+        assertEquals("test", instance.getPluginId());
+        assertEquals("*", instance.getPluginVersionSupport());
+
+        instance = new PluginDependency("test@1.0");
+        assertEquals("test", instance.getPluginId());
+        assertEquals("1.0", instance.getPluginVersionSupport());
+        assertEquals("PluginDependency [pluginId=test, pluginVersionSupport=1.0]", instance.toString());
+    }
+
+
+
+}