diff --git a/spec/form/button_spec.cr b/spec/form/button_spec.cr
new file mode 100644
index 0000000..41fee83
--- /dev/null
+++ b/spec/form/button_spec.cr
@@ -0,0 +1,33 @@
+require "../spec_helper"
+
+WebMock.stub(:get, "example.com/form/button").to_return(body:
+<<-BODY
+
+
+ page_title
+
+
+
+
+
+BODY
+)
+
+describe "Form Fields CheckBox" do
+ agent = Mechanize.new
+
+ page = agent.get("http://example.com/form/button")
+ form = page.forms[0]
+
+ it "returns buttons" do
+ form.buttons.size.should eq 2
+ end
+
+ it "can be found by button_with method" do
+ button2 = form.button_with({"class" => "sndButton"})
+ button2.value.should eq "sndButtonValue"
+ end
+end
diff --git a/src/mechanize/form.cr b/src/mechanize/form.cr
index ffae82e..81f8ed6 100644
--- a/src/mechanize/form.cr
+++ b/src/mechanize/form.cr
@@ -51,6 +51,7 @@ class MechanizeCr::Form
elements_with "field"
elements_with "radiobutton"
elements_with "checkbox", "checkboxes"
+ elements_with "button"
# Returns all fields of type Textarea
def textareas