Preparing for a new release
Updated plugin to be tested with the latest version of Wordpress
Fix merge