diff --git a/TSnackBar.iml b/TSnackBar.iml
index a0991f4..4e0a7b7 100644
--- a/TSnackBar.iml
+++ b/TSnackBar.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="TSnackBar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="TSnackBar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/app/app.iml b/app/app.iml
index 4e05b37..57098cb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TSnackBar" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -23,7 +22,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -45,7 +44,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -53,7 +51,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -61,25 +58,22 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -107,15 +101,15 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="design-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-24.1.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-annotations:24.1.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-v4-24.1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:appcompat-v7-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:design-24.1.1" level="project" />
     <orderEntry type="module" module-name="topsnackbar" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/androidadvance/tsnackbar/DemoCustomView.java b/app/src/main/java/com/androidadvance/tsnackbar/DemoCustomView.java
new file mode 100644
index 0000000..37274ea
--- /dev/null
+++ b/app/src/main/java/com/androidadvance/tsnackbar/DemoCustomView.java
@@ -0,0 +1,25 @@
+package com.androidadvance.tsnackbar;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.LinearLayout;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class DemoCustomView extends LinearLayout {
+    public Button CloseButton;
+
+    public DemoCustomView(Context context) {
+        super(context);
+
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        inflater.inflate(R.layout.demo_custom_view_include, this, true);
+
+        CloseButton = (Button) findViewById(R.id.demo_close_btn);
+    }
+
+
+
+}
diff --git a/app/src/main/java/com/androidadvance/tsnackbar/MainActivity.java b/app/src/main/java/com/androidadvance/tsnackbar/MainActivity.java
index 9179dc2..19dcf16 100644
--- a/app/src/main/java/com/androidadvance/tsnackbar/MainActivity.java
+++ b/app/src/main/java/com/androidadvance/tsnackbar/MainActivity.java
@@ -27,6 +27,8 @@ protected void onCreate(Bundle savedInstanceState) {
         Button button_example_4 = (Button) findViewById(R.id.button_example_4);
         Button button_example_5 = (Button) findViewById(R.id.button_example_5);
         Button button_example_6 = (Button) findViewById(R.id.button_example_6);
+        Button button_example_7 = (Button) findViewById(R.id.button_example_7);
+        Button button_example_8 = (Button) findViewById(R.id.button_example_8);
 
 
         relative_layout_main = (RelativeLayout) findViewById(R.id.relative_layout_main);
@@ -44,7 +46,6 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
 
-
                 TSnackbar snackbar = TSnackbar
                         .make(relative_layout_main, "Had a snack at Snackbar", TSnackbar.LENGTH_LONG)
                         .setAction("Undo", new View.OnClickListener() {
@@ -74,7 +75,7 @@ public void onClick(View v) {
                         .setAction("Action", new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                Log.d("CLICKED Action", "CLIDKED Action");
+                                Log.d("CLICKED Action", "CLICKED Action");
                             }
                         });
                 snackbar.setActionTextColor(Color.WHITE);
@@ -143,5 +144,69 @@ public void onClick(View v) {
 
             }
         });
+
+        button_example_7.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+
+                final TSnackbar snackbar = TSnackbar
+                        .make(relative_layout_main, "Had a snack at Snackbar", TSnackbar.LENGTH_INDEFINITE);
+
+                snackbar.setAction("Action", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Log.d("CLICKED Action", "CLICKED Action");
+                    }
+                }).setAction("Close", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        snackbar.dismiss();
+                        Log.d("CLICKED Close", "CLICKED Close");
+                    }
+                });
+
+
+                snackbar.setActionTextColor(Color.LTGRAY,0);
+                snackbar.setActionTextColor(Color.RED,1);
+                snackbar.setCancelable(false); // Will not dismiss snackbar automatically when tapping on an action. Explicit dismiss required.
+
+                snackbar.addIcon(R.mipmap.ic_core, 200);
+                View snackbarView = snackbar.getView();
+                snackbarView.setBackgroundColor(Color.parseColor("#555555"));
+                TextView textView = (TextView) snackbarView.findViewById(com.androidadvance.topsnackbar.R.id.snackbar_text);
+                textView.setTextColor(Color.WHITE);
+                snackbar.show();
+
+            }
+        });
+
+        button_example_8.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                final TSnackbar snackbar = TSnackbar
+                        .make(relative_layout_main, "Had a snack at Snackbar", TSnackbar.LENGTH_INDEFINITE);
+
+                DemoCustomView demoView = new DemoCustomView(MainActivity.this);
+                demoView.CloseButton.setOnClickListener(new View.OnClickListener() {
+                    public void onClick(View v) {
+                        snackbar.dismiss();
+                        Log.d("CLICKED Close", "CLICKED Close");
+                    }
+                });
+
+                snackbar.setView(demoView); // Inflate a custom view to the Actions side of the Snackbar
+                snackbar.setCancelable(false); // Will not dismiss snackbar automatically when tapping on an action. Explicit dismiss required.
+
+                snackbar.addIcon(R.mipmap.ic_core, 200);
+                View snackbarView = snackbar.getView();
+                snackbarView.setBackgroundColor(Color.parseColor("#555555"));
+                TextView textView = (TextView) snackbarView.findViewById(com.androidadvance.topsnackbar.R.id.snackbar_text);
+                textView.setTextColor(Color.WHITE);
+                snackbar.show();
+
+            }
+        });
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3086ab8..1e191f9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -99,6 +99,30 @@
                         android:id="@+id/button_example_6"
                         android:layout_weight="1" />
                 </LinearLayout>
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:gravity="bottom"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true">
+
+                    <Button
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="Multiple Actions"
+                        android:id="@+id/button_example_7"
+                        android:layout_weight="1" />
+
+                    <Button
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="Custom View"
+                        android:id="@+id/button_example_8"
+                        android:layout_weight="1" />
+                </LinearLayout>
             </LinearLayout>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/demo_custom_view.xml b/app/src/main/res/layout/demo_custom_view.xml
new file mode 100644
index 0000000..a2c638e
--- /dev/null
+++ b/app/src/main/res/layout/demo_custom_view.xml
@@ -0,0 +1,4 @@
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+    class="com.androidadvance.topsnackbar.TSnackbar$DemoCustomView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/demo_custom_view_include.xml b/app/src/main/res/layout/demo_custom_view_include.xml
new file mode 100644
index 0000000..d8f6877
--- /dev/null
+++ b/app/src/main/res/layout/demo_custom_view_include.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <ProgressBar
+        android:id="@+id/indeterminateBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:paddingTop="14dp"
+        android:layout_weight="1"
+        />
+
+    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/demo_close_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
+        android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
+        android:layout_gravity="center_horizontal"
+        android:paddingTop="@dimen/design_snackbar_padding_vertical"
+        android:paddingBottom="@dimen/design_snackbar_padding_vertical"
+        android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
+        android:paddingRight="@dimen/design_snackbar_padding_horizontal"
+        android:visibility="visible"
+        android:textColor="#FF0000"
+        android:text="Close"
+        style="?attr/borderlessButtonStyle" />
+</LinearLayout>
diff --git a/topsnackbar/src/main/java/com/androidadvance/topsnackbar/TSnackbar.java b/topsnackbar/src/main/java/com/androidadvance/topsnackbar/TSnackbar.java
index 8319ae0..c3f5b9d 100644
--- a/topsnackbar/src/main/java/com/androidadvance/topsnackbar/TSnackbar.java
+++ b/topsnackbar/src/main/java/com/androidadvance/topsnackbar/TSnackbar.java
@@ -123,6 +123,7 @@ public boolean handleMessage(Message message) {
     private final SnackbarLayout mView;
     private int mDuration;
     private Callback mCallback;
+    private boolean Cancelable = true;
 
     private TSnackbar(ViewGroup parent) {
         mParent = parent;
@@ -236,6 +237,21 @@ public TSnackbar setMaxWidth(int maxWidth) {
       return this;
   }
 
+    /**
+     * Overrides the max inline action width  of this snackbar's layout.
+     *
+     * To allow the snackbar to have an inline action width equal to the parent view, set a value <= 0.
+     *
+     * @param maxInlineActionWidth the max inline action width in pixels
+     * @return this TSnackbar
+     */
+    public TSnackbar setMaxInlineActionWidth(int maxInlineActionWidth) {
+        mView.mMaxInlineActionWidth = maxInlineActionWidth;
+
+        return this;
+    }
+
+
     private Drawable fitDrawable(Drawable drawable, int sizePx) {
         if (drawable.getIntrinsicWidth() != sizePx || drawable.getIntrinsicHeight() != sizePx) {
 
@@ -281,17 +297,87 @@ private static Bitmap getBitmap(Drawable drawable) {
         }
     }
 
+    /**
+     * Set the snackbar to auto dismiss or not after selecting action
+     *
+     * @param flag  auto dismiss flag
+     */
+    public void setCancelable(boolean flag) {
+        Cancelable = flag;
+    }
+
+    /**
+     * Inflate a new action (Button)
+     *
+     * @return The new action
+     */
+    private Button inflateAction() {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        Button action = (Button) inflater.inflate(R.layout.tsbackbar_layout_action,null);
+        return action;
+    }
+
+    /**
+     * Set a custom view resource to be on the actions side of the Snackbar.
+     *
+     * @param layoutResId The Resource ID to be inflated.
+     */
+    public void setView (int layoutResId) {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View view = inflater.inflate(layoutResId,null);
+
+        setView(view);
+    }
+
+    /**
+     * Set a custom view to be on the actions side of the Snackbar.
+     *
+     * @param view The view to be inflated.
+     */
+    public void setView (View view) {
+        if(view == null)
+            return;
+
+        final LinearLayout actionView = mView.getActionHolderView();
+
+        //Need to make sure this is the only view visible
+        if(actionView.getChildCount() > 0)
+            actionView.removeAllViews();
+
+        actionView.setVisibility(View.VISIBLE);
+        actionView.addView(view);
+    }
 
-    
     @NonNull
     public TSnackbar setAction(@StringRes int resId, View.OnClickListener listener) {
         return setAction(mContext.getText(resId), listener);
     }
 
-    
     @NonNull
-    public TSnackbar setAction(CharSequence text, final View.OnClickListener listener) {
-        final TextView tv = mView.getActionView();
+    public TSnackbar setAction(CharSequence text, final View.OnClickListener listener)
+    {
+        final LinearLayout actionView = mView.getActionHolderView();
+        int childCount = actionView.getChildCount();
+
+        if(childCount >= 3) //Limit 3 actions at most. If more actions needed inflate a custom view
+            return this;
+        else{ //Check and remove any view other than button. Only buttons should be visible when calling setAction
+            for (int i=0; i < childCount; i++){
+                if (!(actionView.getChildAt(i) instanceof Button)) {
+                    actionView.removeViewAt(i);
+                    childCount--;
+                    i--;
+                }
+            }
+        }
+
+        Button action = inflateAction();
+        if(action == null)
+            return this;
+
+        actionView.setVisibility(View.VISIBLE);
+        actionView.addView(action);
+        final TextView tv = action;
 
         if (TextUtils.isEmpty(text) || listener == null) {
             tv.setVisibility(View.GONE);
@@ -303,30 +389,49 @@ public TSnackbar setAction(CharSequence text, final View.OnClickListener listene
                 @Override
                 public void onClick(View view) {
                     listener.onClick(view);
-                    
-                    dispatchDismiss(Callback.DISMISS_EVENT_ACTION);
+
+                    if(Cancelable)
+                        dispatchDismiss(Callback.DISMISS_EVENT_ACTION);
                 }
             });
         }
         return this;
     }
 
-    
     @NonNull
-    public TSnackbar setActionTextColor(ColorStateList colors) {
-        final TextView tv = mView.getActionView();
+    public TSnackbar setActionTextColor(ColorStateList colors, int index) {
+
+        final Button action = mView.getActionView(index);
+        if(action == null)
+            return this;
+
+        final TextView tv = action;
         tv.setTextColor(colors);
         return this;
     }
 
-    
     @NonNull
-    public TSnackbar setActionTextColor(@ColorInt int color) {
-        final TextView tv = mView.getActionView();
+    public TSnackbar setActionTextColor(ColorStateList colors) {
+        return setActionTextColor(colors,0);
+    }
+
+    @NonNull
+    public TSnackbar setActionTextColor(@ColorInt int color, int index) {
+
+        final Button action = mView.getActionView(index);
+        if(action == null)
+            return this;
+
+        final TextView tv = action;
         tv.setTextColor(color);
         return this;
     }
 
+    @NonNull
+    public TSnackbar setActionTextColor(@ColorInt int color) {
+        return setActionTextColor(color,0);
+    }
+
     
     @NonNull
     public TSnackbar setText(@NonNull CharSequence message) {
@@ -616,7 +721,7 @@ private boolean isBeingDragged() {
     
     public static class SnackbarLayout extends LinearLayout {
         private TextView mMessageView;
-        private Button mActionView;
+        private LinearLayout mActionView;
 
         private int mMaxWidth;
         private int mMaxInlineActionWidth;
@@ -642,8 +747,10 @@ public SnackbarLayout(Context context, AttributeSet attrs) {
             super(context, attrs);
             TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SnackbarLayout);
             mMaxWidth = a.getDimensionPixelSize(R.styleable.SnackbarLayout_android_maxWidth, -1);
-            mMaxInlineActionWidth = a.getDimensionPixelSize(
-                    R.styleable.SnackbarLayout_maxActionInlineWidth, -1);
+
+            mMaxInlineActionWidth = -1; // We now can have more than one Actions set to indefinite
+            //mMaxInlineActionWidth = a.getDimensionPixelSize(R.styleable.SnackbarLayout_maxActionInlineWidth, -1);
+
             if (a.hasValue(R.styleable.SnackbarLayout_elevation)) {
                 ViewCompat.setElevation(this, a.getDimensionPixelSize(
                         R.styleable.SnackbarLayout_elevation, 0));
@@ -666,17 +773,32 @@ public SnackbarLayout(Context context, AttributeSet attrs) {
         protected void onFinishInflate() {
             super.onFinishInflate();
             mMessageView = (TextView) findViewById(R.id.snackbar_text);
-            mActionView = (Button) findViewById(R.id.snackbar_action);
+            //mActionView = (Button) findViewById(R.id.snackbar_action);
+            mActionView = (LinearLayout)findViewById(R.id.snackbar_actions_holder);
         }
 
         TextView getMessageView() {
             return mMessageView;
         }
 
-        Button getActionView() {
+        LinearLayout getActionHolderView() {
             return mActionView;
         }
 
+        Button getActionView()
+        {
+            return getActionView(0);
+        }
+
+        Button getActionView(int index)
+        {
+            final LinearLayout actionHolderView = getActionHolderView();
+            int childCount = actionHolderView.getChildCount();
+            if(childCount > 0)
+                return  (Button)actionHolderView.getChildAt(index);
+
+            return null;
+        }
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -696,6 +818,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             boolean remeasure = false;
             if (isMultiLine && mMaxInlineActionWidth > 0
                     && mActionView.getMeasuredWidth() > mMaxInlineActionWidth) {
+
                 if (updateViewsWithinLayout(VERTICAL, multiLineVPadding,
                         multiLineVPadding - singleLineVPadding)) {
                     remeasure = true;
@@ -707,6 +830,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 }
             }
 
+
             if (remeasure) {
                 super.onMeasure(widthMeasureSpec, heightMeasureSpec);
             }
diff --git a/topsnackbar/src/main/res/layout/tsbackbar_layout_action.xml b/topsnackbar/src/main/res/layout/tsbackbar_layout_action.xml
new file mode 100644
index 0000000..cc7405b
--- /dev/null
+++ b/topsnackbar/src/main/res/layout/tsbackbar_layout_action.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:minHeight="0dp"
+        android:minWidth="0dp"
+        android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
+        android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
+        android:layout_gravity="center_vertical|end"
+        android:paddingTop="@dimen/design_snackbar_padding_vertical"
+        android:paddingBottom="@dimen/design_snackbar_padding_vertical"
+        android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
+        android:paddingRight="@dimen/design_snackbar_padding_horizontal"
+        android:visibility="gone"
+        android:textColor="?attr/colorAccent"
+        style="?attr/borderlessButtonStyle"
+        tools:visibility="visible"
+        tools:text="Action"/>
diff --git a/topsnackbar/src/main/res/layout/tsnackbar_layout_include.xml b/topsnackbar/src/main/res/layout/tsnackbar_layout_include.xml
index c701ada..355c2c0 100644
--- a/topsnackbar/src/main/res/layout/tsnackbar_layout_include.xml
+++ b/topsnackbar/src/main/res/layout/tsnackbar_layout_include.xml
@@ -24,27 +24,18 @@
         android:paddingTop="@dimen/design_snackbar_padding_vertical"
         android:paddingBottom="@dimen/design_snackbar_padding_vertical"
         android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
-        android:paddingRight="@dimen/design_snackbar_padding_horizontal"
         android:textAppearance="@style/TextAppearance.Design.Snackbar.Message"
         android:maxLines="@integer/design_snackbar_text_max_lines"
         android:gravity="center_vertical"
         android:layout_gravity="center_vertical|start"
         tools:text="Text Goes Here"
         android:ellipsize="end"/>
-    <Button
-        android:id="@+id/snackbar_action"
+    <LinearLayout
+        android:id="@+id/snackbar_actions_holder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
-        android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
         android:layout_gravity="center_vertical|end"
-        android:paddingTop="@dimen/design_snackbar_padding_vertical"
-        android:paddingBottom="@dimen/design_snackbar_padding_vertical"
-        android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
-        android:paddingRight="@dimen/design_snackbar_padding_horizontal"
-        android:visibility="gone"
-        android:textColor="?attr/colorAccent"
-        style="?attr/borderlessButtonStyle"
-        tools:visibility="visible"
-        tools:text="Action"/>
+        android:orientation="horizontal"
+        android:visibility="gone">
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/topsnackbar/topsnackbar.iml b/topsnackbar/topsnackbar.iml
index cb73a15..5ebcee2 100644
--- a/topsnackbar/topsnackbar.iml
+++ b/topsnackbar/topsnackbar.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":topsnackbar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.androidadvance" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":topsnackbar" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -20,11 +19,11 @@
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -46,7 +45,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -54,7 +52,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -62,7 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -70,7 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -78,10 +73,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -97,19 +90,17 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="design-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-24.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-annotations:24.1.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:support-v4-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:appcompat-v7-24.1.1" level="project" />
+    <orderEntry type="library" exported="" name="com.android.support:design-24.1.1" level="project" />
   </component>
 </module>
\ No newline at end of file