diff --git a/library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java b/library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java
index 767467f3..1d03ba9e 100644
--- a/library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java
+++ b/library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseView.java
@@ -861,6 +861,7 @@ public MaterialShowcaseView build() {
                     }
                     case OVAL_SHAPE: {
                         showcaseView.setShape(new OvalShape(showcaseView.mTarget));
+                        break;
                     }
                     default:
                         throw new IllegalArgumentException("Unsupported shape type: " + shapeType);
diff --git a/sample/src/main/java/uk/co/deanwild/materialshowcaseviewsample/TooltipExample.java b/sample/src/main/java/uk/co/deanwild/materialshowcaseviewsample/TooltipExample.java
index 1ecde737..a57831d2 100644
--- a/sample/src/main/java/uk/co/deanwild/materialshowcaseviewsample/TooltipExample.java
+++ b/sample/src/main/java/uk/co/deanwild/materialshowcaseviewsample/TooltipExample.java
@@ -4,6 +4,7 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
@@ -18,6 +19,7 @@ public class TooltipExample extends Activity implements View.OnClickListener {
     private Button mButtonShow;
     private Button mButtonReset;
     private FloatingActionButton fab;
+    private Toolbar toolbar;
 
     private static final String SHOWCASE_ID = "tooltip example";
 
@@ -35,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
         fab = findViewById(R.id.fab);
         fab.setOnClickListener(this);
 
+        toolbar = findViewById(R.id.toolbar);
+
         presentShowcaseView(); // one second delay
     }
 
@@ -71,6 +75,7 @@ void presentShowcaseView() {
                 new MaterialShowcaseView.Builder(this)
                         .setTarget(mButtonShow)
                         .setToolTip(toolTip1)
+                        .withRectangleShape()
                         .setTooltipMargin(30)
                         .setShapePadding(50)
                         .setDismissOnTouch(true)
diff --git a/sample/src/main/res/layout/activity_tooltip_example.xml b/sample/src/main/res/layout/activity_tooltip_example.xml
index 125186e6..9131301a 100644
--- a/sample/src/main/res/layout/activity_tooltip_example.xml
+++ b/sample/src/main/res/layout/activity_tooltip_example.xml
@@ -2,13 +2,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="uk.co.deanwild.materialshowcaseviewsample.CustomExample">
 
 
-    <FrameLayout
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:background="#00c2eb"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00c2eb">
+        android:layout_height="?attr/actionBarSize"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
 
 
         <Button
@@ -20,7 +25,9 @@
             android:backgroundTint="@android:color/white"
             android:text="Show" />
 
-    </FrameLayout>
+    </android.support.v7.widget.Toolbar>
+
+
 
     <Button
         android:id="@+id/btn_reset"