diff --git a/CHANGES.md b/CHANGES.md
index 864e7de236b3ee19d72cfc1701691fbd85300c14..d68be266d59b9137ff2b206f285cd45acb51176e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,10 @@ moodle-auth_ldap_syncplus
 Changes
 -------
 
+### Unreleased
+
+* 2017-05-05 - Improve README.md
+
 ### v3.2-r2
 
 * 2017-03-03 - Adopt code changes in Moodle 3.2 core auth_ldap
diff --git a/README.md b/README.md
index a511bd263ba8881b444dd40cc07709cc8e971c57..b0810279449d4aea017f5887ae388d91c6b28e0d 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,7 @@
 moodle-auth_ldap_syncplus
 =========================
 
-Moodle authentication method which provides all functionality of auth_ldap, but supports advanced features for the LDAP synchronization task:
-
-* It adds the possibility to the LDAP synchronization task to suspend users which have disappeared in LDAP for a configurable amount of days and delete them only after this grace period (the Moodle core LDAP synchronization task only provides you the option to suspend _or_ delete users which have disappeared in LDAP - MDL-47018).
-* You can prevent the LDAP synchronization task from creating Moodle accounts for all LDAP users if they have never logged into Moodle before (the Moodle core LDAP synchronization task always creates Moodle accounts for all LDAP users - MDL-29249).
-* You can fetch user details from LDAP on manual user creation (MDL-47029).
-* It supports login via email for first-time LDAP logins (Moodle core only supports login via email for existing Moodle users - MDL-46638)
-* It adds several line breaks to the output of the LDAP synchronization task to improve readability (MDL-30589).
+Moodle authentication plugin which provides all functionality of auth_ldap, but supports advanced features for the LDAP synchronization task and LDAP authentication.
 
 
 Requirements
@@ -16,6 +10,24 @@ Requirements
 This plugin requires Moodle 3.2+
 
 
+Motivation for this plugin
+--------------------------
+
+Moodle core's auth_ldap authentication plugin is a great basis for authenticating users in Moodle. However, as Moodle core's auth_ldap is somehow limited in several aspects and there is no prospect to have it improved in Moodle core, we have implemented an extended version for LDAP authentication with these key features:
+
+* The most important part: All functions from auth_ldap are still working if you use this authentication plugin.
+
+* The plugin adds the possibility to the LDAP synchronization task to suspend users which have disappeared in LDAP for a configurable amount of days and delete them only after this grace period (the Moodle core LDAP synchronization task only provides you the option to suspend _or_ delete users which have disappeared in LDAP - MDL-47018).
+
+* You can prevent the LDAP synchronization task from creating Moodle accounts for all LDAP users if they have never logged into Moodle before (the Moodle core LDAP synchronization task always creates Moodle accounts for all LDAP users - MDL-29249).
+
+* You can fetch user details from LDAP on manual user creation (MDL-47029).
+
+* It supports login via email for first-time LDAP logins (Moodle core only supports login via email for existing Moodle users - MDL-46638)
+
+* It adds several line breaks to the output of the LDAP synchronization task to improve readability (MDL-30589).
+
+
 Installation
 ------------
 
@@ -28,24 +40,28 @@ See http://docs.moodle.org/en/Installing_plugins for details on installing Moodl
 Usage & Settings
 ----------------
 
-auth_ldap_syncplus is a plugin which inherits and reuses most of the code from the Moodle core auth_ldap plugin. All functions from auth_ldap are still working.
+After installing the plugin, it does not do anything to Moodle yet.
 
-After installing auth_ldap_syncplus, you will find a new authentification method on the admin page /admin/settings.php?section=manageauths.
+To configure the plugin and its behaviour, please visit:
+Site administration -> Plugins -> Authentication -> Manage authentication -> LDAP server (Sync Plus)
 
-To make use of this plugin, you have to configure it on admin page /admin/auth_config.php?auth=ldap_syncplus with the same settings like you would configure the Moodle core LDAP authentication method.
+There, you configure the plugin with the same settings like you would configure the Moodle core LDAP authentication method.
 
-Please note that there are additional setting items in settings section "Cron synchronization script" compared to the Moodle core LDAP authentication method:
+Please note that there are additional setting items in settings section "User account synchronisation" compared to the Moodle core LDAP authentication method:
 
-1. Setting "Removed ext user" has an additional option called "Suspend internal and fully delete internal after grace period". If you select this option, the synchronization task will suspend users which have disappeared in LDAP for a configurable amount of days and delete them only after this grace period. If the user reappears in LDAP within the grace period, his Moodle account is revived and he can login again into Moodle as he did before.
+### 1. Removed ext user
 
-2. Setting "Fully deleting grace period": With this setting (Default: 10 days), you can control the length of the grace period until a user account is fully deleted after it has disappeared from LDAP.
+The setting "Removed ext user" has an additional option called "Suspend internal and fully delete internal after grace period". If you select this option, the synchronization task will suspend users which have disappeared in LDAP for a configurable amount of days and delete them only after this grace period. If the user reappears in LDAP within the grace period, his Moodle account is revived and he can login again into Moodle as he did before.
 
-3. Setting "Add new users": With this setting (Default: yes), you can prevent the synchronization task from creating Moodle accounts for all LDAP users if they have never logged into Moodle before.
+### 2. Fully deleting grace period
 
-After configuring the LDAP SyncPlus authentication method, you should activate the plugin on admin page /admin/settings.php?section=manageauths so that users can be authenticated with this authentication method. Afterwards, you can deactivate the Moodle core LDAP authentication method as it is not needed anymore actively.
+With the setting "Fully deleting grace period" (Default: 10 days), you can control the length of the grace period until a user account is fully deleted after it has disappeared from LDAP.
 
-Note: If you already have users in your Moodle installation who authenticate using the core "ldap" authentication method, you should switch them to the new authentication method "ldap_syncplus" by running the following SQL command in your Moodle database:
-UPDATE mdl_user SET auth='ldap_syncplus' WHERE auth='ldap'
+### 3. Add new users
+
+With the setting "Add new users" (Default: yes), you can prevent the synchronization task from creating Moodle accounts for all LDAP users if they have never logged into Moodle before.
+
+After configuring the LDAP server (Sync Plus) authentication method, you have to activate the plugin on Site administration -> Plugins -> Authentication -> Manage authentication so that users can be authenticated with this authentication method. Afterwards, you can deactivate the Moodle core LDAP authentication method as it is not needed anymore actively.
 
 
 Configuring LDAP User account syncronisation
@@ -56,6 +72,21 @@ To leverage the additional LDAP synchronization features of auth_ldap_syncplus,
 If you don't know how to setup LDAP User account syncronisation at all, see https://docs.moodle.org/en/LDAP_authentication#Enabling_the_LDAP_users_sync_job.
 
 
+Migrating from auth_ldap to auth_ldap_syncplus
+----------------------------------------------
+
+If you already have users in your Moodle installation who authenticate using the auth_ldap authentication method and want to switch them to auth_ldap_syncplus, proceed this way:
+
+* Configure auth_ldap_syncplus as an _additional_ authentication method while keeping auth_ldap activated.
+
+* Create a test user and set his authentication method to auth_ldap_syncplus. Test if this user is able to log into Moodle properly.
+
+* Switch all existing users to the auth_ldap_syncplus authentication method by running the following SQL command in your Moodle database:
+`UPDATE mdl_user SET auth='ldap_syncplus' WHERE auth='ldap'`
+
+* Disable auth_ldap authentication method.
+
+
 Fetching user details from LDAP on manual user creation
 -------------------------------------------------------
 
@@ -67,34 +98,77 @@ With auth_ldap_syncplus, you can create an user manually on Site administration
 This feature is enabled automatically and can be used as soon as you are using auth_ldap_syncplus as your LDAP authentication plugin like described above.
 
 
-Themes
-------
+How this plugin works
+---------------------
+
+This plugin is implemented with minimal code duplication in mind. It inherits / requires as much code as possible from auth_ldap and only implements the extended functionalities.
+
 
-The auth_ldap_syncplus plugin acts behind the scenes, therefore it works with all moodle themes.
+Theme support
+-------------
 
+This plugin acts behind the scenes, therefore it should work with all Moodle themes.
+It has been developed on and tested with Moodle Core's Clean and Boost themes.
 
-Further information
+
+Plugin repositories
 -------------------
 
-auth_ldap_syncplus is found in the Moodle Plugins repository: https://moodle.org/plugins/view/auth_ldap_syncplus
+This plugin is published and regularly updated in the Moodle plugins repository:
+http://moodle.org/plugins/view/auth_ldap_syncplus
+
+The latest development version can be found on Github:
+https://github.com/moodleuulm/moodle-auth_ldap_syncplus
+
+
+Bug and problem reports / Support requests
+------------------------------------------
+
+This plugin is carefully developed and thoroughly tested, but bugs and problems can always appear.
+
+Please report bugs and problems on Github:
+https://github.com/moodleuulm/moodle-auth_ldap_syncplus/issues
 
-Report a bug or suggest an improvement: https://github.com/moodleuulm/moodle-auth_ldap_syncplus/issues
+We will do our best to solve your problems, but please note that due to limited resources we can't always provide per-case support.
+
+
+Feature proposals
+-----------------
+
+Due to limited resources, the functionality of this plugin is primarily implemented for our own local needs and published as-is to the community. We are aware that members of the community will have other needs and would love to see them solved by this plugin.
+
+Please issue feature proposals on Github:
+https://github.com/moodleuulm/moodle-auth_ldap_syncplus/issues
+
+Please create pull requests on Github:
+https://github.com/moodleuulm/moodle-auth_ldap_syncplus/pulls
+
+We are always interested to read about your feature proposals or even get a pull request from you, but please accept that we can handle your issues only as feature _proposals_ and not as feature _requests_.
 
 
 Moodle release support
 ----------------------
 
-Due to limited resources, auth_ldap_syncplus is only maintained for the most recent major release of Moodle. However, previous versions of this plugin which work in legacy major releases of Moodle are still available as-is without any further updates in the Moodle Plugins repository.
+Due to limited resources, this plugin is only maintained for the most recent major release of Moodle. However, previous versions of this plugin which work in legacy major releases of Moodle are still available as-is without any further updates in the Moodle Plugins repository.
+
+There may be several weeks after a new major release of Moodle has been published until we can do a compatibility check and fix problems if necessary. If you encounter problems with a new major release of Moodle - or can confirm that this plugin still works with a new major relase - please let us know on Github.
+
+If you are running a legacy version of Moodle, but want or need to run the latest version of this plugin, you can get the latest version of the plugin, remove the line starting with $plugin->requires from version.php and use this latest plugin version then on your legacy Moodle. However, please note that you will run this setup completely at your own risk. We can't support this approach in any way and there is a undeniable risk for erratic behavior.
+
+
+Translating this plugin
+-----------------------
+
+This Moodle plugin is shipped with an english language pack only. All translations into other languages must be managed through AMOS (https://lang.moodle.org) by what they will become part of Moodle's official language pack.
 
-There may be several weeks after a new major release of Moodle has been published until we can do a compatibility check and fix problems if necessary. If you encounter problems with a new major release of Moodle - or can confirm that auth_ldap_syncplus still works with a new major relase - please let us know on https://github.com/moodleuulm/moodle-auth_ldap_syncplus/issues
+As the plugin creator, we manage the translation into german for our own local needs on AMOS. Please contribute your translation into all other languages in AMOS where they will be reviewed by the official language pack maintainers for Moodle.
 
 
 Right-to-left support
 ---------------------
 
 This plugin has not been tested with Moodle's support for right-to-left (RTL) languages.
-If you want to use this plugin with a RTL language and it doesn't work as-is, you are free to send us a pull request on
-github with modifications.
+If you want to use this plugin with a RTL language and it doesn't work as-is, you are free to send us a pull request on Github with modifications.
 
 
 Contribution to Moodle Core