diff --git a/bootstrap-for-contact-form-7.php b/bootstrap-for-contact-form-7.php
index ecf39e9..c5f6778 100755
--- a/bootstrap-for-contact-form-7.php
+++ b/bootstrap-for-contact-form-7.php
@@ -3,7 +3,7 @@
 Plugin Name: Bootstrap for Contact Form 7
 Plugin URI:  https://wordpress.org/plugins/bootstrap-for-contact-form-7/
 Description: This plugin modifies the output of the popular Contact Form 7 plugin to be styled in compliance with themes using the Bootstrap CSS framework.
-Version:     1.3.1
+Version:     1.4.0
 Author:      Felix Arntz
 Author URI:  https://leaves-and-love.net
 License:     GNU General Public License v3
@@ -24,7 +24,7 @@
 }
 
 function cf7bs_maybe_init() {
-	define( 'CF7BS_VERSION', '1.3.1' );
+	define( 'CF7BS_VERSION', '1.4.0' );
 	define( 'CF7BS_MAINFILE', __FILE__ );
 	define( 'CF7BS_PATH', untrailingslashit( plugin_dir_path( CF7BS_MAINFILE ) ) );
 	define( 'CF7BS_URL', untrailingslashit( plugin_dir_url( CF7BS_MAINFILE ) ) );
diff --git a/composer.json b/composer.json
index b68c4d3..9ccd351 100755
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "felixarntz/bootstrap-for-contact-form-7",
   "description": "This plugin modifies the output of the popular Contact Form 7 plugin to be styled in compliance with themes using the Bootstrap CSS framework.",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "license": "GPL-3.0",
   "type": "wordpress-plugin",
   "keywords": [
diff --git a/gulpfile.js b/gulpfile.js
index a989672..ec572e4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -34,7 +34,7 @@ var config = {
 	contributors: [ 'flixos90' ].join( ', ' ),
 	donateLink: 'https://leaves-and-love.net/wordpress-plugins/',
 	minRequired: '3.6',
-	testedUpTo: '4.5.3',
+	testedUpTo: '4.6',
 	translateURI: 'https://translate.wordpress.org/projects/wp-plugins/' + pkg.name,
 	network: false
 };
diff --git a/package.json b/package.json
index 7e077a0..b691a22 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-for-contact-form-7",
   "pluginName": "Bootstrap for Contact Form 7",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "This plugin modifies the output of the popular Contact Form 7 plugin to be styled in compliance with themes using the Bootstrap CSS framework.",
   "keywords": [
     "wordpress",
diff --git a/readme.txt b/readme.txt
index 0df1aa0..ff69d20 100755
--- a/readme.txt
+++ b/readme.txt
@@ -7,9 +7,9 @@ Author URI:        https://leaves-and-love.net
 Contributors:      flixos90
 Donate link:       https://leaves-and-love.net/wordpress-plugins/
 Requires at least: 3.6
-Tested up to:      4.5.3
-Stable tag:        1.3.1
-Version:           1.3.1
+Tested up to:      4.6
+Stable tag:        1.4.0
+Version:           1.4.0
 License:           GNU General Public License v3
 License URI:       http://www.gnu.org/licenses/gpl-3.0.html
 Tags:              contact form 7, wpcf7, bootstrap, bootstrap 3, bootstrap framework, addon, contact form 7 addon, contact form, cf7bs
@@ -111,6 +111,13 @@ You can also contribute to the plugin by translating it. Simply visit [translate
 
 == Changelog ==
 
+= 1.4.0 =
+* Enhanced: all form settings except `submit_size`, `submit_type` and `required_html` can now be overridden on a per-field basis by providing the setting name and its intended value as a shortcode attribute
+* Enhanced: a new value 'none' is now supported for the `layout` form setting which will prevent any wrapper from rendering; it is recommended to only use this for advanced field layouts
+* Enhanced: a new attribute `label_class` can now be added to shortcodes for additional label classes
+* Enhanced: `input_before` and `input_after` now support HTML by putting something like `{input_before}<span>Content before</span>{/input_before} into the content of a field shortcode (make sure to use curly braces); this method is now recommended and takes precedence over the old way
+* Fixed: the label of the `free_text` option in radio buttons / checkboxes is now displayed correctly
+
 = 1.3.1 =
 * Enhanced: alerts can now be made dismissible by defining the constant `CF7BS_ALERT_DISMISSIBLE`
 * Fixed: properly add `for` attributes to labels for checkbox and radio groups for accessibility