diff --git a/.idea/misc.xml b/.idea/misc.xml
index 711833a..6919f60 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,7 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8 (4)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index aa41b78..052b3e2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,11 +3,11 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/DrawRouteMaps.iml" filepath="$PROJECT_DIR$/DrawRouteMaps.iml" />
-      <module fileurl="file://$PROJECT_DIR$/DrawRouteMaps.iml" filepath="$PROJECT_DIR$/DrawRouteMaps.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://C:\Android\contribution\DrawRouteMaps\DrawRouteMaps.iml" filepath="C:\Android\contribution\DrawRouteMaps\DrawRouteMaps.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://C:\Android\contribution\DrawRouteMaps\app\app.iml" filepath="C:\Android\contribution\DrawRouteMaps\app\app.iml" />
       <module fileurl="file://$PROJECT_DIR$/drawroutemap/drawroutemap.iml" filepath="$PROJECT_DIR$/drawroutemap/drawroutemap.iml" />
-      <module fileurl="file://$PROJECT_DIR$/drawroutemap/drawroutemap.iml" filepath="$PROJECT_DIR$/drawroutemap/drawroutemap.iml" />
+      <module fileurl="file://C:\Android\contribution\DrawRouteMaps\drawroutemap\drawroutemap.iml" filepath="C:\Android\contribution\DrawRouteMaps\drawroutemap\drawroutemap.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawRouteMaps.java b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawRouteMaps.java
index 475494a..972ae86 100644
--- a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawRouteMaps.java
+++ b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawRouteMaps.java
@@ -5,6 +5,8 @@
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.LatLng;
 
+import java.util.ArrayList;
+
 /**
  * Created by ocittwo on 11/14/16.
  *
@@ -32,6 +34,13 @@ public DrawRouteMaps draw(LatLng origin, LatLng destination, GoogleMap googleMap
         return instance;
     }
 
+    public DrawRouteMaps draw(LatLng origin, LatLng destination, ArrayList<LatLng> waypoints, GoogleMap googleMap) {
+        String url_route = FetchUrl.getUrlWithWayPoints(origin, destination,waypoints);
+        DrawRoute drawRoute = new DrawRoute(googleMap);
+        drawRoute.execute(new String[]{url_route});
+        return instance;
+    }
+
     public static Context getContext() {
         return instance.context;
     }
diff --git a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/FetchUrl.java b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/FetchUrl.java
index 6e2b6e9..657e8ef 100644
--- a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/FetchUrl.java
+++ b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/FetchUrl.java
@@ -2,6 +2,8 @@
 
 import com.google.android.gms.maps.model.LatLng;
 
+import java.util.ArrayList;
+
 /**
  * Created by ocittwo on 11/14/16.
  *
@@ -19,4 +21,18 @@ public static String getUrl(LatLng origin, LatLng dest) {
         String output = "json";
         return "https://maps.googleapis.com/maps/api/directions/" + output + "?" + parameters;
     }
+
+    public static String getUrlWithWayPoints(LatLng origin, LatLng dest, ArrayList<LatLng> waypoints) {
+        String str_origin = "origin=" + origin.latitude + "," + origin.longitude;
+        String str_dest = "destination=" + dest.latitude + "," + dest.longitude;
+        String str_waypoints = "waypoints=optimize:true|";
+        for(LatLng latLng : waypoints){
+            str_waypoints = str_waypoints + "via:" + latLng.latitude + "," + latLng.longitude + "|";
+        }
+        String sensor = "sensor=false";
+        String transit = "transit=walking";
+        String parameters = str_origin + "&" + str_dest +  "&" + str_waypoints + "&" + sensor + "&" + transit;
+        String output = "json";
+        return "https://maps.googleapis.com/maps/api/directions/" + output + "?" + parameters;
+    }
 }