diff --git a/js/spinbox.js b/js/spinbox.js
index f68acf646..9258d84f4 100644
--- a/js/spinbox.js
+++ b/js/spinbox.js
@@ -8,10 +8,10 @@
 
 // -- BEGIN UMD WRAPPER PREFACE --
 
-// For more information on UMD visit: 
+// For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function(factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -19,7 +19,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
@@ -28,8 +28,12 @@
 
 	// SPINBOX CONSTRUCTOR AND PROTOTYPE
 
-	var Spinbox = function (element, options) {
+	var Spinbox = function(element, options) {
 		this.$element = $(element);
+		this.$element.find('.btn').on('click', function(e) {
+			//keep spinbox from submitting if they forgot to say type="button" on their spinner buttons
+			e.preventDefault();
+		});
 		this.options = $.extend({}, $.fn.spinbox.defaults, options);
 		this.$input = this.$element.find('.spinbox-input');
 		this.$element.on('focusin.fu.spinbox', this.$input, $.proxy(this.changeFlag, this));
@@ -41,13 +45,21 @@
 		this.mousewheelTimeout = {};
 
 		if (this.options.hold) {
-			this.$element.on('mousedown.fu.spinbox', '.spinbox-up', $.proxy(function() { this.startSpin(true); } , this));
+			this.$element.on('mousedown.fu.spinbox', '.spinbox-up', $.proxy(function() {
+				this.startSpin(true);
+			}, this));
 			this.$element.on('mouseup.fu.spinbox', '.spinbox-up, .spinbox-down', $.proxy(this.stopSpin, this));
 			this.$element.on('mouseout.fu.spinbox', '.spinbox-up, .spinbox-down', $.proxy(this.stopSpin, this));
-			this.$element.on('mousedown.fu.spinbox', '.spinbox-down', $.proxy(function() {this.startSpin(false);} , this));
+			this.$element.on('mousedown.fu.spinbox', '.spinbox-down', $.proxy(function() {
+				this.startSpin(false);
+			}, this));
 		} else {
-			this.$element.on('click.fu.spinbox', '.spinbox-up', $.proxy(function() { this.step(true); } , this));
-			this.$element.on('click.fu.spinbox', '.spinbox-down', $.proxy(function() { this.step(false); }, this));
+			this.$element.on('click.fu.spinbox', '.spinbox-up', $.proxy(function() {
+				this.step(true);
+			}, this));
+			this.$element.on('click.fu.spinbox', '.spinbox-down', $.proxy(function() {
+				this.step(false);
+			}, this));
 		}
 
 		this.switches = {
@@ -89,20 +101,20 @@
 			return this.$element[0].outerHTML;
 		},
 
-		render: function () {
-			var inputValue = this.parseInput( this.$input.val() );
+		render: function() {
+			var inputValue = this.parseInput(this.$input.val());
 			var maxUnitLength = '';
 
 			// if input is empty and option value is default, 0
 			if (inputValue !== '' && this.options.value === 0) {
 				this.value(inputValue);
 			} else {
-				this.output ( this.options.value );
+				this.output (this.options.value);
 			}
 
-			if ( this.options.units.length ) {
-				$.each(this.options.units, function(index, value){
-					if( value.length > maxUnitLength.length) {
+			if (this.options.units.length) {
+				$.each(this.options.units, function(index, value) {
+					if (value.length > maxUnitLength.length) {
 						maxUnitLength = value;
 					}
 				});
@@ -112,8 +124,10 @@
 
 		output: function(value, updateField) {
 			value = (value + '').split('.').join(this.options.decimalMark);
-			updateField = ( updateField || true );
-			if ( updateField ) { this.$input.val(value); }
+			updateField = (updateField || true);
+			if (updateField) {
+				this.$input.val(value);
+			}
 
 			return value;
 		},
@@ -124,36 +138,36 @@
 			return value;
 		},
 
-		change: function () {
-			var newVal = this.parseInput( this.$input.val() ) || '';
+		change: function() {
+			var newVal = this.parseInput(this.$input.val()) || '';
 
-			if(this.options.units.length || this.options.decimalMark !== '.'){
+			if (this.options.units.length || this.options.decimalMark !== '.') {
 				newVal = this.parseValueWithUnit(newVal);
-			} else if (newVal/1){
-				newVal = this.options.value = this.checkMaxMin(newVal/1);
+			} else if (newVal / 1) {
+				newVal = this.options.value = this.checkMaxMin(newVal / 1);
 			} else {
-				newVal = this.checkMaxMin(newVal.replace(/[^0-9.-]/g,'') || '');
-				this.options.value = newVal/1;
+				newVal = this.checkMaxMin(newVal.replace(/[^0-9.-]/g, '') || '');
+				this.options.value = newVal / 1;
 			}
-			this.output ( newVal );
+			this.output (newVal);
 
 			this.changeFlag = false;
 			this.triggerChangedEvent();
 		},
 
-		changeFlag: function(){
+		changeFlag: function() {
 			this.changeFlag = true;
 		},
 
-		stopSpin: function () {
-			if(this.switches.timeout!==undefined){
+		stopSpin: function() {
+			if (this.switches.timeout !== undefined) {
 				clearTimeout(this.switches.timeout);
 				this.switches.count = 1;
 				this.triggerChangedEvent();
 			}
 		},
 
-		triggerChangedEvent: function () {
+		triggerChangedEvent: function() {
 			var currentValue = this.value();
 			if (currentValue === this.lastValue) return;
 
@@ -163,7 +177,7 @@
 			this.$element.trigger('changed.fu.spinbox', this.output(currentValue, false)); // no DOM update
 		},
 
-		startSpin: function (type) {
+		startSpin: function(type) {
 
 			if (!this.options.disabled) {
 				var divisor = this.switches.count;
@@ -171,31 +185,33 @@
 				if (divisor === 1) {
 					this.step(type);
 					divisor = 1;
-				} else if (divisor < 3){
+				} else if (divisor < 3) {
 					divisor = 1.5;
-				} else if (divisor < 8){
+				} else if (divisor < 8) {
 					divisor = 2.5;
 				} else {
 					divisor = 4;
 				}
 
-				this.switches.timeout = setTimeout($.proxy(function() {this.iterate(type);} ,this),this.switches.speed/divisor);
+				this.switches.timeout = setTimeout($.proxy(function() {
+					this.iterate(type);
+				}, this), this.switches.speed / divisor);
 				this.switches.count++;
 			}
 		},
 
-		iterate: function (type) {
+		iterate: function(type) {
 			this.step(type);
 			this.startSpin(type);
 		},
 
-		step: function (isIncrease) {
+		step: function(isIncrease) {
 			// isIncrease: true is up, false is down
 
 			var digits, multiple, currentValue, limitValue;
 
 			// trigger change event
-			if( this.changeFlag ) {
+			if (this.changeFlag) {
 				this.change();
 			}
 
@@ -203,11 +219,11 @@
 			currentValue = this.options.value;
 			limitValue = isIncrease ? this.options.max : this.options.min;
 
-			if ((isIncrease ? currentValue < limitValue : currentValue > limitValue)) {
+			if ( (isIncrease ? currentValue < limitValue : currentValue > limitValue) ) {
 				var newVal = currentValue + (isIncrease ? 1 : -1) * this.options.step;
 
 				// raise to power of 10 x number of decimal places, then round
-				if(this.options.step % 1 !== 0){
+				if (this.options.step % 1 !== 0) {
 					digits = (this.options.step + '').split('.')[1].length;
 					multiple = Math.pow(10, digits);
 					newVal = Math.round(newVal * multiple) / multiple;
@@ -216,37 +232,35 @@
 				// if outside limits, set to limit value
 				if (isIncrease ? newVal > limitValue : newVal < limitValue) {
 					this.value(limitValue);
-				}
-				else {
+				} else {
 					this.value(newVal);
 				}
 
-			}
-			else if (this.options.cycle) {
+			} else if (this.options.cycle) {
 				var cycleVal = isIncrease ? this.options.min : this.options.max;
 				this.value(cycleVal);
 			}
 		},
 
-		value: function (value) {
+		value: function(value) {
 
-			if ( value || value === 0 ) {
-				if( this.options.units.length || this.options.decimalMark !== '.' ) {
-					this.output( this.parseValueWithUnit( value + (this.unit || '') ) );
+			if (value || value === 0) {
+				if (this.options.units.length || this.options.decimalMark !== '.') {
+					this.output(this.parseValueWithUnit(value + (this.unit || '')));
 					return this;
-				
-				} else if ( !isNaN(parseFloat(value)) && isFinite(value) ) {
-					this.options.value = value/1;
-					this.output ( value + (this.unit ? this.unit : '') ) ;
+
+				} else if (!isNaN(parseFloat(value)) && isFinite(value)) {
+					this.options.value = value / 1;
+					this.output (value + (this.unit ? this.unit : ''));
 					return this;
-				
+
 				}
 			} else {
-				if( this.changeFlag ) {
+				if (this.changeFlag) {
 					this.change();
 				}
 
-				if( this.unit ){
+				if (this.unit) {
 					return this.options.value + this.unit;
 				} else {
 					return this.output(this.options.value, false); // no DOM update
@@ -254,11 +268,11 @@
 			}
 		},
 
-		isUnitLegal: function (unit) {
+		isUnitLegal: function(unit) {
 			var legalUnit;
 
-			$.each(this.options.units, function(index, value){
-				if( value.toLowerCase() === unit.toLowerCase()){
+			$.each(this.options.units, function(index, value) {
+				if (value.toLowerCase() === unit.toLowerCase()) {
 					legalUnit = unit.toLowerCase();
 					return false;
 				}
@@ -268,94 +282,94 @@
 		},
 
 		// strips units and add them back
-		parseValueWithUnit: function( value ){
-			var unit = value.replace(/[^a-zA-Z]/g,'');
-			var number = value.replace(/[^0-9.-]/g,'');
+		parseValueWithUnit: function(value) {
+			var unit = value.replace(/[^a-zA-Z]/g, '');
+			var number = value.replace(/[^0-9.-]/g, '');
 
-			if(unit){
+			if (unit) {
 				unit = this.isUnitLegal(unit);
 			}
 
-			this.options.value = this.checkMaxMin(number/1);
+			this.options.value = this.checkMaxMin(number / 1);
 			this.unit = unit || undefined;
 			return this.options.value + (unit || '');
 		},
 
-		checkMaxMin: function(value){
+		checkMaxMin: function(value) {
 			// if unreadable
-			if ( isNaN( parseFloat(value) ) ) {
+			if (isNaN(parseFloat(value))) {
 				return value;
 			}
 			// if not within range return the limit
-			if ( !( value <= this.options.max && value >= this.options.min ) ){
+			if (!(value <= this.options.max && value >= this.options.min)) {
 				value = value >= this.options.max ? this.options.max : this.options.min;
 			}
 			return value;
 		},
 
-		disable: function () {
+		disable: function() {
 			this.options.disabled = true;
 			this.$element.addClass('disabled');
-			this.$input.attr('disabled','');
+			this.$input.attr('disabled', '');
 			this.$element.find('button').addClass('disabled');
 		},
 
-		enable: function () {
+		enable: function() {
 			this.options.disabled = false;
 			this.$element.removeClass('disabled');
-			this.$input.removeAttr("disabled");
+			this.$input.removeAttr('disabled');
 			this.$element.find('button').removeClass('disabled');
 		},
 
-		keydown: function(event){
+		keydown: function(event) {
 			var keyCode = event.keyCode;
-			if(keyCode===38){
+			if (keyCode === 38) {
 				this.step(true);
-			}else if(keyCode===40){
+			} else if (keyCode === 40) {
 				this.step(false);
 			}
 		},
 
-		keyup: function(event){
+		keyup: function(event) {
 			var keyCode = event.keyCode;
 
-			if(keyCode===38 || keyCode===40){
+			if (keyCode === 38 || keyCode === 40) {
 				this.triggerChangedEvent();
 			}
 		},
 
-		bindMousewheelListeners: function(){
+		bindMousewheelListeners: function() {
 			var inputEl = this.$input.get(0);
-			if(inputEl.addEventListener){
+			if (inputEl.addEventListener) {
 				//IE 9, Chrome, Safari, Opera
 				inputEl.addEventListener('mousewheel', $.proxy(this.mousewheelHandler, this), false);
 				// Firefox
 				inputEl.addEventListener('DOMMouseScroll', $.proxy(this.mousewheelHandler, this), false);
-			}else{
+			} else {
 				// IE <9
 				inputEl.attachEvent('onmousewheel', $.proxy(this.mousewheelHandler, this));
 			}
 		},
 
-		mousewheelHandler: function(event){
+		mousewheelHandler: function(event) {
 			var e = window.event || event; // old IE support
 			var delta = Math.max(-1, Math.min(1, (e.wheelDelta || -e.detail)));
 			var self = this;
 
 			clearTimeout(this.mousewheelTimeout);
-			this.mousewheelTimeout = setTimeout(function(){
+			this.mousewheelTimeout = setTimeout(function() {
 				self.triggerChangedEvent();
 			}, 300);
 
-			if(delta<0){
+			if (delta < 0) {
 				this.step(true);
-			}else{
+			} else {
 				this.step(false);
 			}
 
-			if(e.preventDefault){
+			if (e.preventDefault) {
 				e.preventDefault();
-			}else{
+			} else {
 				e.returnValue = false;
 			}
 			return false;
@@ -365,24 +379,24 @@
 
 	// SPINBOX PLUGIN DEFINITION
 
-	$.fn.spinbox = function (option) {
-		var args = Array.prototype.slice.call( arguments, 1 );
+	$.fn.spinbox = function(option) {
+		var args = Array.prototype.slice.call(arguments, 1);
 		var methodReturn;
 
-		var $set = this.each(function () {
-			var $this   = $( this );
-			var data    = $this.data('fu.spinbox');
+		var $set = this.each(function() {
+			var $this = $(this);
+			var data = $this.data('fu.spinbox');
 			var options = typeof option === 'object' && option;
 
-			if( !data ) {
-				$this.data('fu.spinbox', (data = new Spinbox( this, options ) ) );
+			if (!data) {
+				$this.data('fu.spinbox', (data = new Spinbox(this, options)));
 			}
-			if( typeof option === 'string' ) {
-				methodReturn = data[ option ].apply( data, args );
+			if (typeof option === 'string') {
+				methodReturn = data[option].apply(data, args);
 			}
 		});
 
-		return ( methodReturn === undefined ) ? $set : methodReturn;
+		return (methodReturn === undefined) ? $set : methodReturn;
 	};
 
 	// value needs to be 0 for this.render();
@@ -401,7 +415,7 @@
 
 	$.fn.spinbox.Constructor = Spinbox;
 
-	$.fn.spinbox.noConflict = function () {
+	$.fn.spinbox.noConflict = function() {
 		$.fn.spinbox = old;
 		return this;
 	};
@@ -409,16 +423,16 @@
 
 	// DATA-API
 
-	$(document).on('mousedown.fu.spinbox.data-api', '[data-initialize=spinbox]', function (e) {
+	$(document).on('mousedown.fu.spinbox.data-api', '[data-initialize=spinbox]', function(e) {
 		var $control = $(e.target).closest('.spinbox');
-		if ( !$control.data('fu.spinbox') ) {
+		if (!$control.data('fu.spinbox')) {
 			$control.spinbox($control.data());
 		}
 	});
 
 	// Must be domReady for AMD compatibility
-	$(function () {
-		$('[data-initialize=spinbox]').each(function () {
+	$(function() {
+		$('[data-initialize=spinbox]').each(function() {
 			var $this = $(this);
 			if (!$this.data('fu.spinbox')) {
 				$this.spinbox($this.data());
@@ -426,6 +440,6 @@
 		});
 	});
 
-// -- BEGIN UMD WRAPPER AFTERWORD --
+	// -- BEGIN UMD WRAPPER AFTERWORD --
 }));
 // -- END UMD WRAPPER AFTERWORD --
diff --git a/test/markup/spinbox-markup.html b/test/markup/spinbox-markup.html
index b882a8599..780434447 100644
--- a/test/markup/spinbox-markup.html
+++ b/test/markup/spinbox-markup.html
@@ -2,15 +2,15 @@
 
 	<div class="form-group">
 		<label class="control-label" for="MySpinbox">Without Default</label>
-		
+
 		<div id="MySpinbox" class="spinbox">
 			<input id="MySpinboxWithDefaultInput" type="text" class="form-control input-mini spinbox-input">
 
 			<div class="spinbox-buttons btn-group btn-group-vertical">
-				<button class="btn btn-default spinbox-up btn-xs">
+				<button type="button" class="btn btn-default spinbox-up btn-xs">
 					<span class="glyphicon glyphicon-chevron-up"></span><span class="sr-only">Increase</span>
 				</button>
-				<button class="btn btn-default spinbox-down btn-xs">
+				<button type="button" class="btn btn-default spinbox-down btn-xs">
 					<span class="glyphicon glyphicon-chevron-down"></span><span class="sr-only">Decrease</span>
 				</button>
 			</div>
@@ -20,15 +20,15 @@
 
 	<div class="form-group">
 		<label class="control-label" for="MySpinboxWithDefaultInput">With Default</label>
-		
+
 		<div id="MySpinboxWithDefault" class="spinbox">
 			<input id="MySpinboxWithDefaultInput" type="text" value="3" class="form-control input-mini spinbox-input">
 
 			<div class="spinbox-buttons btn-group btn-group-vertical">
-				<button class="btn btn-default spinbox-up btn-xs">
+				<button type="button" class="btn btn-default spinbox-up btn-xs">
 					<span class="glyphicon glyphicon-chevron-up"></span><span class="sr-only">Increase</span>
 				</button>
-				<button class="btn btn-default spinbox-down btn-xs">
+				<button type="button" class="btn btn-default spinbox-down btn-xs">
 					<span class="glyphicon glyphicon-chevron-down"></span><span class="sr-only">Decrease</span>
 				</button>
 			</div>
@@ -39,7 +39,7 @@
 	<div class="form-group">
 		<label class="control-label" for="MySpinboxWithDecimalInput">With decimal and units</label>
 		<div class="form-group">
-			
+
 			<div id="MySpinboxDecimal" class="spinbox">
 				<input id="MySpinboxWithDecimalInput" type="text" class="form-control input-mini spinbox-input">