diff --git a/Sorts/BubbleSort.java b/Sorts/BubbleSort.java
index 1abe69368..648501077 100644
--- a/Sorts/BubbleSort.java
+++ b/Sorts/BubbleSort.java
@@ -1,58 +1,70 @@
-import java.util.Scanner;
-
 /**
- * This class implements BubbleSort
- * 
- * @author Unknown
+ *
+ * @author Varun Upadhyay (https://github.com/varunu28)
  *
  */
 
 class BubbleSort
 {
-	/**
-	 * Main Method
-	 * 
-	 * @param args Command line arguments
-	 */
-	public static void main(String[] args) 
-	{
-		int size = 6;
-		int array[]=new int[size];
-		boolean swap;
-		int last = size - 1;
-		Scanner input=new Scanner(System.in);
-		
+    /**
+     * This method implements the Generic Bubble Sort
+     *
+     * @param array The array to make the binary search
+     * @param last The count of total number of elements in array
+     * Sorts the array in increasing order
+     **/
 
-		//Input
-		System.out.println("Enter any 6 Numbers for Unsorted Array : ");
-		for(int i=0; i<6; i++)
-		{
-			array[i]=input.nextInt();
-		}
+    public static <T extends Comparable<T>> void BS(T array[], int last) {
+        //Sorting
+        boolean swap;
+        do
+        {
+            swap = false;
+            for (int count = 0; count < last-1; count++)
+            {
+                int comp = array[count].compareTo(array[count + 1]);
+                if (comp > 0)
+                {
+                    T temp = array[count];
+                    array[count] = array[count + 1];
+                    array[count + 1] = temp;
+                    swap = true;
+                }
+            }
+            last--;
+        } while (swap);
+    }
 
-		//Sorting
-		do
-     		{
-          		swap = false;
-          		for (int count = 0; count < last; count++)
-          		{
-               			if (array[count] > array[count + 1])
-               			{
-                    			int temp = array[count];
-                    			array[count] = array[count + 1];
-                    			array[count + 1] = temp;
-                    			swap = true;
-               			}
-          		}
-			
-          		last--;
-     		} while (swap);
+    // Driver Program
+    public static void main(String[] args)
+    {
+        // Integer Input
+        int[] arr1 = {4,23,6,78,1,54,231,9,12};
+        int last = arr1.length;
+        Integer[] array = new Integer[last];
+        for (int i=0;i<last;i++) {
+            array[i] = arr1[i];
+        }
 
-		//Output
-		for(int i=0; i<6; i++)
-		{
-			System.out.print(array[i]+"\t");
-		}
-		input.close();
-	}
+        BS(array, last);
+
+        // Output => 1	  4	 6	9	12	23	54	78	231
+        for(int i=0; i<last; i++)
+        {
+            System.out.print(array[i]+"\t");
+        }
+        System.out.println();
+
+        // String Input
+        String[] array1 = {"c", "a", "e", "b","d"};
+        last = array1.length;
+
+        BS(array1, last);
+
+        //Output => a	  b	 c	d	e
+        for(int i=0; i<last; i++)
+        {
+            System.out.print(array1[i]+"\t");
+        }
+    }
 }